#
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2007 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
include $(TOPDIR)/rules.mk
PKG_NAME:=curl
-PKG_VERSION:=7.14.0
+PKG_VERSION:=7.17.1
PKG_RELEASE:=1
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://curl.haxx.se/download/ \
http://www.mirrorspace.org/curl/ \
ftp://ftp.planetmirror.com/pub/curl/ \
http://www.mirrormonster.com/curl/download/ \
http://curl.mirrors.cyberservers.net/download/
-PKG_MD5SUM:=46ce665e47d37fce1a0bad935cce58a9
-PKG_CAT:=bzcat
+PKG_MD5SUM:=1fa635d1dfde8337c98c82749d75c1de
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP = libtool
include $(INCLUDE_DIR)/package.mk
-define Package/libcurl
- SECTION:=libs
- CATEGORY:=Libraries
- DEPENDS:=+libopenssl +zlib
- TITLE:=A client-side URL transfer utility
- DESCRIPTION:=A client-side URL transfer utility.
+define Package/curl/Default
+ SECTION:=net
+ CATEGORY:=Network
URL:=http://curl.haxx.se/
endef
define Package/curl
- SECTION:=net
- CATEGORY:=Network
+ $(call Package/curl/Default)
DEPENDS:=+libcurl
TITLE:=A client-side URL transfer library
- DESCRIPTION:=A client-side URL transfer library.
- URL:=http://curl.haxx.se/
endef
+define Package/libcurl
+ $(call Package/curl/Default)
+ SECTION:=libs
+ CATEGORY:=Libraries
+ DEPENDS:=+libopenssl +zlib
+ TITLE:=A client-side URL transfer utility
+endef
+
+CONFIGURE_ARGS += \
+ --enable-shared \
+ --enable-static \
+ --disable-thread \
+ --enable-cookies \
+ --enable-crypto-auth \
+ --enable-nonblocking \
+ --enable-file \
+ --enable-ftp \
+ --enable-http \
+ --enable-ipv6 \
+ --disable-ares \
+ --disable-debug \
+ --disable-dict \
+ --disable-gopher \
+ --disable-ldap \
+ --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 \
+ --with-zlib="$(STAGING_DIR)/usr" \
+
+CONFIGURE_VARS += \
+ LDFLAGS="$$$$LDFLAGS -lcrypto -lssl -lz" \
+ CC="$(filter-out ccache,$(TARGET_CC))"
+
define Build/Configure
- (cd $(PKG_BUILD_DIR); rm -f config.cache; \
- $(TARGET_CONFIGURE_OPTS) \
- CFLAGS="$(strip $(TARGET_CFLAGS))" \
- CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
- LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
- PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --program-prefix="" \
- --program-suffix="" \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --datadir=/usr/share \
- --includedir=/usr/include \
- --infodir=/usr/share/info \
- --libdir=/usr/lib \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --mandir=/usr/share/man \
- --sbindir=/usr/sbin \
- --sysconfdir=/etc \
- $(DISABLE_LARGEFILE) \
- $(DISABLE_NLS) \
- --enable-shared \
- --enable-static \
- --disable-rpath \
- --with-gnu-ld \
- --disable-thread \
- --enable-cookies \
- --enable-crypto-auth \
- --enable-nonblocking \
- --enable-file \
- --enable-ftp \
- --enable-http \
- --enable-ipv6 \
- --disable-ares \
- --disable-debug \
- --disable-dict \
- --disable-gopher \
- --disable-ldap \
- --disable-manual \
- --disable-sspi \
- --disable-telnet \
- --disable-verbose \
- --with-random="/dev/urandom" \
- --with-ssl="$(STAGING_DIR)/usr" \
- --without-ca-bundle \
- --without-gnutls \
- --without-libidn \
- --with-zlib="$(STAGING_DIR)/usr" \
- );
+ $(call Build/Configure/Default,,bash)
endef
define Build/Compile
- rm -rf $(PKG_INSTALL_DIR)
- mkdir -p $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) \
DESTDIR="$(PKG_INSTALL_DIR)" \
- all install
+ CC="$(TARGET_CC)" \
+ install
endef
-define Package/libcurl/install
- install -m0755 -d $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(1)/usr/lib/
+define Build/InstallDev
+ $(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 $(STAGING_DIR)/usr/bin/curl-config $(2)/bin/
endef
define Package/curl/install
- install -m0755 -d $(1)/usr/bin
- $(CP) $(PKG_INSTALL_DIR)/usr/bin/curl $(1)/usr/bin/
+ $(INSTALL_DIR) $(1)/usr/bin
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/curl $(1)/usr/bin/
endef
-define Build/InstallDev
- mkdir -p $(STAGING_DIR)/usr/bin
- $(CP) $(PKG_INSTALL_DIR)/usr/bin/curl-config $(STAGING_DIR)/usr/bin/
- mkdir -p $(STAGING_DIR)/usr/include
- $(CP) $(PKG_INSTALL_DIR)/usr/include/curl $(STAGING_DIR)/usr/include/
- mkdir -p $(STAGING_DIR)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.{a,so*} $(STAGING_DIR)/usr/lib/
- $(SED) 's,-I/usr/include,,g' $(STAGING_DIR)/usr/bin/curl-config
- $(SED) 's,-L/usr/lib,,g' $(STAGING_DIR)/usr/bin/curl-config
-endef
-
-define Build/UninstallDev
- rm -rf \
- $(STAGING_DIR)/usr/bin/curl-config \
- $(STAGING_DIR)/usr/include/curl \
- $(STAGING_DIR)/usr/lib/libcurl.{a,so*}
+define Package/libcurl/install
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.so.* $(1)/usr/lib/
endef
-$(eval $(call BuildPackage,libcurl))
$(eval $(call BuildPackage,curl))
+$(eval $(call BuildPackage,libcurl))