diff options
| author | Linux User <wbx@linux.(none)> | 2009-10-01 15:44:52 +0200 |
|---|---|---|
| committer | Linux User <wbx@linux.(none)> | 2009-10-01 15:44:52 +0200 |
| commit | 1d2ddabc7b9d0b63887058f6799c281cfa1f1370 (patch) | |
| tree | 3e332a0293df7fed64796e81398469ad4be9eaca /package/curl | |
| parent | 71c91ce903a90de852b5d66a27a673ff6e785cee (diff) | |
some native build fixes
- git package needs a better fix. but existing symlinks are broken
build without perl
- update curl to latest upstream, including libcurl-dev package
- add libopenssl-dev package
Diffstat (limited to 'package/curl')
| -rw-r--r-- | package/curl/Config.in | 14 | ||||
| -rw-r--r-- | package/curl/Makefile | 7 | ||||
| -rw-r--r-- | package/curl/patches/patch-configure | 17 |
3 files changed, 22 insertions, 16 deletions
diff --git a/package/curl/Config.in b/package/curl/Config.in index b5d42ea1f..c9d34b5c8 100644 --- a/package/curl/Config.in +++ b/package/curl/Config.in @@ -11,16 +11,24 @@ config ADK_PACKAGE_LIBCURL select ADK_PACKAGE_LIBOPENSSL select ADK_PACKAGE_ZLIB help - A client-side URL transfer library. + http://curl.haxx.se/ +config ADK_PACKAGE_LIBCURL_DEV + prompt "libcurl-dev....................... development files for libcurl" + tristate + default n + depends on ADK_PACKAGE_LIBCURL + select ADK_COMPILE_CURL + select ADK_PACKAGE_LIBOPENSSL + select ADK_PACKAGE_ZLIB + help 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..a0e27d77c 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 7.19.0 +PKG_VERSION:= 7.19.6 PKG_RELEASE:= 1 -PKG_MD5SUM:= 35f51ac7bcff689b2d2d6e38a3c4d1ae +PKG_MD5SUM:= 6625de9d42d1b8d3af372d3241a576fd PKG_DESCR:= a client-side URL transfer tool PKG_SECTION:= net PKG_URL:= http://curl.haxx.se @@ -26,6 +26,7 @@ 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_DEV,libcurl-dev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION_1})) CONFIGURE_STYLE= gnu CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t @@ -54,7 +55,9 @@ INSTALL_STYLE= auto post-install: ${INSTALL_DIR} ${IDIR_CURL}/usr/bin ${IDIR_LIBCURL}/usr/lib + ${INSTALL_DIR} ${IDIR_LIBCURL_DEV}/usr/include/curl ${CP} ${WRKINST}/usr/bin/curl ${IDIR_CURL}/usr/bin/ ${CP} ${WRKINST}/usr/lib/libcurl.so.* ${IDIR_LIBCURL}/usr/lib/ + ${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..3cb59e18e 100644 --- a/package/curl/patches/patch-configure +++ b/package/curl/patches/patch-configure @@ -1,21 +1,16 @@ -$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.6.orig/configure 2009-07-22 22:11:25.000000000 +0200 ++++ curl-7.19.6/configure 2009-10-01 14:05:37.578930054 +0200 +@@ -25479,16 +25479,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:$LINENO: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5 +-$as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;} - fi - fi - |