diff options
Diffstat (limited to 'package/curl')
| -rw-r--r-- | package/curl/Config.in | 26 | ||||
| -rw-r--r-- | package/curl/Makefile | 41 | ||||
| -rw-r--r-- | package/curl/patches/patch-configure | 20 |
3 files changed, 35 insertions, 52 deletions
diff --git a/package/curl/Config.in b/package/curl/Config.in deleted file mode 100644 index b5d42ea1f..000000000 --- a/package/curl/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config ADK_COMPILE_CURL - tristate - default n - depends on ADK_PACKAGE_LIBCURL - -config ADK_PACKAGE_LIBCURL - prompt "libcurl........................... A client-side URL transfer library" - tristate - default n - select ADK_COMPILE_CURL - select ADK_PACKAGE_LIBOPENSSL - select ADK_PACKAGE_ZLIB - help - A client-side URL transfer library. - - http://curl.haxx.se/ - -config ADK_PACKAGE_CURL - prompt "curl............................ A client-side URL transfer tool" - tristate - default n - depends on ADK_PACKAGE_LIBCURL - help - A client-side URL transfer tool. - - http://curl.haxx.se/ diff --git a/package/curl/Makefile b/package/curl/Makefile index 078a940bf..9f771defb 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,11 +4,13 @@ include ${TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 7.19.0 +PKG_VERSION:= 7.19.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 35f51ac7bcff689b2d2d6e38a3c4d1ae +PKG_MD5SUM:= ecb2e37e45c9933e2a963cabe03670ab PKG_DESCR:= a client-side URL transfer tool PKG_SECTION:= net +PKG_DEPENDS:= libcurl +PKG_BUILDDEP+= openssl zlib PKG_URL:= http://curl.haxx.se PKG_SITES:= http://curl.haxx.se/download/ \ http://www.mirrorspace.org/curl/ \ @@ -18,16 +20,23 @@ PKG_SITES:= http://curl.haxx.se/download/ \ http://www.mirrormonster.com/curl/download/ \ http://curl.mirrors.cyberservers.net/download/ -PKG_DESCR_1:= a client-side URL transfer library -PKG_SECTION_1:= libs -PKG_DEPENDS_1:= libopenssl zlib +PKG_DESCR_LIB:= a client-side URL transfer library +PKG_SECTION_LIB:= libs +PKG_DEPENDS_LIB:= libopenssl zlib +PKG_DESCR_LIB_DEV:= development files for libcurl +PKG_SECTION_LIB_DEV:= devel include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,CURL,curl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1})) +$(eval $(call PKG_template,LIBCURL,libcurl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_LIB},${PKG_DESCR_LIB},${PKG_SECTION_LIB})) +$(eval $(call PKG_template,LIBCURL_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR_LIB_DEV},${PKG_SECTION_LIB_DEV})) + +SUB_INSTALLS-y:= +SUB_INSTALLS-m:= +SUB_INSTALLS-${ADK_PACKAGE_CURL}+= curl-install +SUB_INSTALLS-${ADK_PACKAGE_LIBCURL_DEV}+= libcurl-dev-install -CONFIGURE_STYLE= gnu CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t CONFIGURE_ARGS+= --disable-thread \ --enable-cookies \ @@ -49,12 +58,18 @@ CONFIGURE_ARGS+= --disable-thread \ --without-ca-bundle \ --without-gnutls \ --without-libidn -BUILD_STYLE= auto -INSTALL_STYLE= auto -post-install: - ${INSTALL_DIR} ${IDIR_CURL}/usr/bin ${IDIR_LIBCURL}/usr/lib - ${CP} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/ - ${CP} ${WRKINST}/usr/lib/libcurl.so.* ${IDIR_LIBCURL}/usr/lib/ +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-dev-install: + ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl + ${CP} ${WRKINST}/usr/include/curl/*.h \ + ${IDIR_LIBCURL_DEV}/usr/include/curl/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/curl/patches/patch-configure b/package/curl/patches/patch-configure index d046721f0..21c0b095d 100644 --- a/package/curl/patches/patch-configure +++ b/package/curl/patches/patch-configure @@ -1,24 +1,18 @@ -$Id$ - - Don't do *THAT* for cross-compiling. - ---- curl-7.16.3.orig/configure 2007-06-25 11:18:41.000000000 +0200 -+++ curl-7.16.3/configure 2007-08-02 17:44:28.000000000 +0200 -@@ -25783,17 +25783,6 @@ fi - +--- 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 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -- + - if test "$OPENSSL_ENABLED" = "1"; then - if test -n "$LIB_OPENSSL"; then - - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$LIB_OPENSSL" - export LD_LIBRARY_PATH -- { echo "$as_me:$LINENO: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5 --echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;} +- { $as_echo "$as_me:${as_lineno-$LINENO}: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5 +-$as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;} - fi - fi -- - fi + fi |