diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 18:10:19 +0100 |
| commit | 46b2bb3001ce838ba2483a08418587d8a027f3a9 (patch) | |
| tree | b2b618839b5afcc859fcb90556e6f199d9a9a10c /package/apr | |
| parent | 88d3e6d6c572143bd95a589a44e30bfefd616b88 (diff) | |
| parent | 902ee7e7b23751ca7a8264d36a837aa4aae12032 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/apr')
| -rw-r--r-- | package/apr/Makefile | 3 | ||||
| -rw-r--r-- | package/apr/patches/patch-build_ltmain_sh | 11 |
2 files changed, 12 insertions, 2 deletions
diff --git a/package/apr/Makefile b/package/apr/Makefile index 096981833..2b6c05305 100644 --- a/package/apr/Makefile +++ b/package/apr/Makefile @@ -13,7 +13,7 @@ PKG_DEPENDS:= libpthread PKG_URL:= http://apr.apache.org/ PKG_SITES:= http://gd.tuwien.ac.at/infosys/servers/http/apache/dist/${PKG_NAME}/ -PKG_FLAVOURS:= WITH_IPV6 +PKG_FLAVOURS_APR:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk @@ -28,7 +28,6 @@ CONFIGURE_ENV+= ac_cv_file__dev_zero=yes CONFIGURE_ENV+= apr_cv_process_shared_works=no CONFIGURE_ENV+= ac_cv_lib_nsl_gethostbyname=no CONFIGURE_ENV+= apr_cv_tcp_nodelay_with_cork=no - CONFIGURE_ARGS+= --with-devrandom=/dev/urandom \ --enable-threads diff --git a/package/apr/patches/patch-build_ltmain_sh b/package/apr/patches/patch-build_ltmain_sh new file mode 100644 index 000000000..0ce8441f6 --- /dev/null +++ b/package/apr/patches/patch-build_ltmain_sh @@ -0,0 +1,11 @@ +--- apr-1.4.2.orig/build/ltmain.sh 2010-01-21 08:59:41.000000000 +0100 ++++ apr-1.4.2/build/ltmain.sh 2011-01-14 11:41:48.000000000 +0100 +@@ -4765,7 +4765,7 @@ func_mode_link () + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # @file GCC response files + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ +- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) ++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" |