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/curl | |
| parent | 88d3e6d6c572143bd95a589a44e30bfefd616b88 (diff) | |
| parent | 902ee7e7b23751ca7a8264d36a837aa4aae12032 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/curl')
| -rw-r--r-- | package/curl/Makefile | 15 | ||||
| -rw-r--r-- | package/curl/patches/patch-configure | 6 | ||||
| -rw-r--r-- | package/curl/patches/patch-ltmain_sh | 11 |
3 files changed, 19 insertions, 13 deletions
diff --git a/package/curl/Makefile b/package/curl/Makefile index ab6e45416..4e1dd6bf5 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -21,7 +21,7 @@ PKGSS_LIBCURL:= libopenssl zlib PKGSD_LIBCURL_DEV:= development files for libcurl PKGSC_LIBCURL_DEV:= devel -PKG_FLAVOURS:= WITH_IPV6 +PKG_FLAVOURS_CURL:= WITH_IPV6 PKGFD_WITH_IPV6:= enable IPv6 support include ${TOPDIR}/mk/package.mk @@ -30,11 +30,6 @@ $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS $(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_LIBCURL},${PKGSD_LIBCURL},${PKGSC_LIBCURL})) $(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBCURL_DEV},${PKGSC_LIBCURL_DEV})) -SUB_INSTALLS-y:= -SUB_INSTALLS-m:= -SUB_INSTALLS-${ADK_PACKAGE_CURL}+= curl-install -SUB_INSTALLS-${ADK_PACKAGE_LIBCURL_DEV}+= libcurl-dev-install - CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t CONFIGURE_ARGS+= --disable-thread \ --enable-cookies \ @@ -63,14 +58,14 @@ else CONFIGURE_ARGS+= --disable-ipv6 endif -post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} - ${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib - ${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/ - curl-install: ${INSTALL_DIR} ${IDIR_CURL}/usr/bin ${INSTALL_BIN} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/ +libcurl-install: + ${INSTALL_DIR} ${IDIR_LIBCURL}/usr/lib + ${CP} ${WRKINST}/usr/lib/libcurl.so* ${IDIR_LIBCURL}/usr/lib/ + libcurl-dev-install: ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl ${CP} ${WRKINST}/usr/include/curl/*.h \ diff --git a/package/curl/patches/patch-configure b/package/curl/patches/patch-configure index 21c0b095d..27e43ebf0 100644 --- a/package/curl/patches/patch-configure +++ b/package/curl/patches/patch-configure @@ -1,6 +1,6 @@ ---- curl-7.19.7.orig/configure 2009-11-04 13:26:02.000000000 +0100 -+++ curl-7.19.7/configure 2009-12-03 21:07:01.000000000 +0100 -@@ -19233,15 +19233,6 @@ fi +--- curl-7.21.0.orig/configure 2010-06-05 00:32:04.000000000 +0200 ++++ curl-7.21.0/configure 2011-01-14 12:05:38.000000000 +0100 +@@ -19714,15 +19714,6 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi diff --git a/package/curl/patches/patch-ltmain_sh b/package/curl/patches/patch-ltmain_sh new file mode 100644 index 000000000..b1eef4628 --- /dev/null +++ b/package/curl/patches/patch-ltmain_sh @@ -0,0 +1,11 @@ +--- curl-7.21.0.orig/ltmain.sh 2010-05-27 21:20:16.000000000 +0200 ++++ curl-7.21.0/ltmain.sh 2011-01-14 12:07:25.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" |