diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-08-01 23:45:44 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-08-01 23:45:44 +0200 |
| commit | 9d75f0d407be54a14bbb6bcae4d96cb433b69c86 (patch) | |
| tree | 32752cc509826a6b53598dfd90c8ce54c863502b /package | |
| parent | 4fa46b6a63a479a7a216b519c329dbfe53b0ca39 (diff) | |
remove unzip dependency, use delivered cpio. some code cleanup
Diffstat (limited to 'package')
| -rw-r--r-- | package/asterisk/Makefile | 4 | ||||
| -rw-r--r-- | package/cpufrequtils/patches/patch-utils_aperf_c | 18 | ||||
| -rw-r--r-- | package/e2fsprogs/Makefile | 3 |
3 files changed, 21 insertions, 4 deletions
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 8e5f96d27..a6025ce43 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -101,9 +101,9 @@ CONFIGURE_ARGS+= --with-ogg=${STAGING_DIR}/usr \ TLDFLAGS+= -logg endif ifneq (${ADK_PACKAGE_ASTERISK_CURL},) -CONFIGURE_ARGS+= --with-curl=${STAGING_DIR}/usr +CONFIGURE_ARGS+= --with-libcurl=${STAGING_DIR}/usr else -CONFIGURE_ARGS+= --without-curl +CONFIGURE_ARGS+= --without-libcurl endif ifneq (${ADK_PACKAGE_ASTERISK_PGSQL},) CONFIGURE_ARGS+= --with-postgres=${STAGING_DIR}/usr diff --git a/package/cpufrequtils/patches/patch-utils_aperf_c b/package/cpufrequtils/patches/patch-utils_aperf_c new file mode 100644 index 000000000..3e39dd625 --- /dev/null +++ b/package/cpufrequtils/patches/patch-utils_aperf_c @@ -0,0 +1,18 @@ +--- cpufrequtils-008.orig/utils/aperf.c 2010-07-05 17:43:17.000000000 +0200 ++++ cpufrequtils-008/utils/aperf.c 2010-08-01 22:41:37.905732041 +0200 +@@ -68,11 +68,15 @@ struct avg_perf_cpu_info + + static int cpu_has_effective_freq() + { ++#if defined(__i386__) || defined(__x86_64__) + /* largest base level */ + if (cpuid_eax(0) < 6) + return 0; + + return cpuid_ecx(6) & 0x1; ++#else ++ return 0; ++#endif + } + + /* diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 7f09627a1..34c2cdab8 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -31,8 +31,7 @@ $(eval $(call PKG_template,LIBSS,libss,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESC $(eval $(call PKG_template,LIBBLKID,libblkid,${PKG_VERSION}-${PKG_RELEASE},,${PKG_DESCR_BLKID},${PKG_SECTION_BLKID})) CONFIGURE_ARGS+= --enable-elf-shlibs \ - --disable-tls \ - --enable-dynamic-e2fsck + --disable-tls INSTALL_TARGET+= install-libs pre-build: |