X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Fcurl%2FMakefile;h=905fa45bc9c5e653ad9b82f9c31e0f43c0c14f6f;hp=51954057059dc59dc5702fadaf93129e335d33cf;hb=58fc276c2d4f4cc40d319b05e3ce3477d815366c;hpb=6121c7071c97391280b6963d6cfe61a86bc1efa8

diff --git a/libs/curl/Makefile b/libs/curl/Makefile
index 5195405705..905fa45bc9 100644
--- a/libs/curl/Makefile
+++ b/libs/curl/Makefile
@@ -1,15 +1,14 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=curl
-PKG_VERSION:=7.14.0
+PKG_VERSION:=7.21.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -20,7 +19,10 @@ PKG_SOURCE_URL:=http://curl.haxx.se/download/ \
 	ftp://ftp.planetmirror.com/pub/curl/ \
 	http://www.mirrormonster.com/curl/download/ \
 	http://curl.mirrors.cyberservers.net/download/
-PKG_MD5SUM:=46ce665e47d37fce1a0bad935cce58a9
+PKG_MD5SUM:=5f6d50c4d4ee38c57fe37e3cff75adbd
+
+PKG_FIXUP:=libtool
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -32,8 +34,9 @@ endef
 
 define Package/curl
   $(call Package/curl/Default)
+  SUBMENU:=File Transfer
   DEPENDS:=+libcurl
-  TITLE:=A client-side URL transfer library
+  TITLE:=A client-side URL transfer utility
 endef
 
 define Package/libcurl
@@ -41,9 +44,11 @@ define Package/libcurl
   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=+libopenssl +zlib
-  TITLE:=A client-side URL transfer utility
+  TITLE:=A client-side URL transfer library
 endef
 
+TARGET_CFLAGS += $(FPIC)
+
 CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
@@ -54,7 +59,6 @@ CONFIGURE_ARGS += \
 	--enable-file \
 	--enable-ftp \
 	--enable-http \
-	--enable-ipv6 \
 	--disable-ares \
 	--disable-debug \
 	--disable-dict \
@@ -63,42 +67,46 @@ CONFIGURE_ARGS += \
 	--disable-manual \
 	--disable-sspi \
 	--disable-telnet \
+	--enable-tftp \
 	--disable-verbose \
 	--with-random="/dev/urandom" \
 	--with-ssl="$(STAGING_DIR)/usr" \
 	--without-ca-bundle \
 	--without-gnutls \
+	--without-krb4 \
 	--without-libidn \
+	--without-nss \
+	--without-libssh2 \
 	--with-zlib="$(STAGING_DIR)/usr" \
-	--disable-gssapi
+	$(call autoconf_bool,CONFIG_IPV6,ipv6) \
 
-define Build/Configure
-	$(call Build/Configure/Default)
-	$(call libtool_disable_rpath)
-endef
+CONFIGURE_VARS += \
+	LDFLAGS="$$$$LDFLAGS -lcrypto -lssl -lz" \
+	CC="$(filter-out ccache,$(TARGET_CC))"
+
+#define Build/Configure
+#	(cd $(PKG_BUILD_DIR); \
+#		autoreconf -v --install || exit 1 \
+#	);
+#	$(call Build/Configure/Default)
+#endef
 
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) all
-	$(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		CC="$(TARGET_CC)" \
+		install
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
+	$(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(1)/usr/bin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/curl $(1)/usr/include/
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.{a,so*} $(1)/usr/lib/
 	$(CP) $(PKG_BUILD_DIR)/libcurl.pc $(1)/usr/lib/pkgconfig/
 	$(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/curl-config
-	$(SED) 's,$(TARGET_LDFLAGS),,g' $(1)/usr/lib/pkgconfig/libcurl.pc
-	ln -sf $(1)/usr/bin/curl-config $(2)/bin/
-endef
-
-define Build/UninstallDev
-	rm -rf	$(STAGING_DIR)/usr/bin/curl-config \
-		$(STAGING_DIR)/usr/include/curl \
-		$(STAGING_DIR)/usr/lib/libcurl.{a,so*} \
-		$(STAGING_DIR)/usr/lib/pkgconfig/libcurl.pc
+	$(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/libcurl.pc
+	ln -sf $(STAGING_DIR)/usr/bin/curl-config $(2)/bin/
 endef
 
 define Package/curl/install