X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=libs%2Fapr%2FMakefile;h=43f075036c5fe21d713ecfd930068ea080b9e200;hb=5d07d5ce5a0fc9a8e65ac76f0c13725d082e57c2;hp=2663f8612d1827f8ba4a82d1ff73560de70369e8;hpb=96d7bf49ee1a1c0dd5b47c27737bd6cc699e6105;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/libs/apr/Makefile b/libs/apr/Makefile
index 2663f8612d..43f075036c 100644
--- a/libs/apr/Makefile
+++ b/libs/apr/Makefile
@@ -1,92 +1,72 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2010 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:=apr
-PKG_VERSION:=1.2.8
+PKG_VERSION:=1.4.2
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://apache.d-s-s-p.de/apr/
-PKG_MD5SUM:=814f19528d9cfc79aef188dd752e04d8
-PKG_CAT:=zcat
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.ibiblio.org/pub/mirrors/apache/apr
+PKG_MD5SUM:=4b00e8f70c067893d075577962656b35
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP:=libtool
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/apr
+define Package/libapr
   SECTION:=libs
   CATEGORY:=Libraries
   DEPENDS:=+libpthread
   TITLE:=Apache Portable Runtime Library
-  DESCRIPTION:=\
-  	Apache Portable Runtime Library
   URL:=http://apr.apache.org/
 endef
 
-define Build/Configure	
-	$(call Build/Configure/Default, \
-		--with-devrandom=/dev/urandom \
-		--disable-dso \
-		--disable-ipv6 \
-		, \
-		ac_cv_file__dev_zero=yes \
-		apr_cv_process_shared_works=no \
-		apr_cv_mutex_robust_shared=no \
-		apr_cv_tcp_nodelay_with_cork=yes \
-		ac_cv_sizeof_ssize_t=4 \
-		LDFLAGS="-lpthread -L$(STAGING_DIR)/lib" \
-		CFLAGS="-I$(STAGING_DIR)/include" \
-	)
-endef
+TARGET_CFLAGS += $(FPIC)
+CONFIGURE_ARGS += \
+	--with-devrandom=/dev/urandom \
+	--disable-dso \
+	--enable-ipv6
 
-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-endef
+# XXX: ac_cv_sizeof_struct_iovec=1 is just to trick configure
+CONFIGURE_VARS += \
+	ac_cv_sizeof_struct_iovec=1 \
+	apr_cv_process_shared_works=no \
+	apr_cv_mutex_robust_shared=no \
+	apr_cv_tcp_nodelay_with_cork=yes \
+	LDFLAGS="$$$$LDFLAGS -lpthread" \
 
 define Build/InstallDev
-	mkdir -p $(STAGING_DIR)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 $(1)/usr/lib $(1)/usr/lib/pkgconfig $(1)/usr/share/build-1
 	$(CP)   $(PKG_INSTALL_DIR)/usr/bin/apr-1-config \
-		$(STAGING_DIR)/usr/bin
-	mkdir -p $(STAGING_DIR)/usr/include
-	$(CP)   $(PKG_INSTALL_DIR)/usr/include/apr-1/ \
-		$(STAGING_DIR)/usr/include/
-	mkdir -p $(STAGING_DIR)/usr/lib
-	$(CP)   $(PKG_INSTALL_DIR)/usr/lib/*apr* \
-		$(STAGING_DIR)/usr/lib/
-	mkdir -p $(STAGING_DIR)/usr/share/
-	$(CP)   $(PKG_INSTALL_DIR)/usr/share/build-1/ \
-		$(STAGING_DIR)/usr/share/
-	$(SED) "s,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1," $(STAGING_DIR)/usr/share/build-1/apr_rules.mk
-	$(SED)  "s,\"/usr\",$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/apr-1-config
-	$(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libapr-1.la
-	$(SED)  "s,"bindir\=\"/usr/bin\"",bindir=\"$(STAGING_DIR)/usr/bin\"," $(STAGING_DIR)/usr/bin/apr-1-config
-	$(SED)  "s,"datadir\=\"/usr/share\"",datadir=\"$(STAGING_DIR)/usr/share\"," $(STAGING_DIR)/usr/bin/apr-1-config
-	$(SED)  "s,"installbuilddir\=\"/usr/share/build-1\"",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\"," $(STAGING_DIR)/usr/bin/apr-1-config
-endef
-
-define Build/UninstallDev
-	rm	$(STAGING_DIR)/usr/bin/apr-config \
-		$(STAGING_DIR)/usr/lib/{libapr-1*,apr.exp} \
-	rm -rf	$(STAGING_DIR)/usr/share/build-1/ \
-		$(STAGING_DIR)/usr/include/apr-1/
+		$(1)/usr/bin/
+	$(CP)   $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
+		$(1)/usr/include/apr-1/
+	$(CP)   $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} \
+		$(1)/usr/lib/
+	$(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \
+		$(1)/usr/lib/pkgconfig/
+	$(CP)   $(PKG_INSTALL_DIR)/usr/share/build-1/* \
+		$(1)/usr/share/build-1/
+	$(SED) 's,^datadir=\"/usr/share\",datadir=\"$(STAGING_DIR)/usr/share\",g' $(1)/usr/bin/apr-1-config
+	$(SED) 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(STAGING_DIR)/usr/share/build-1\",g' $(1)/usr/bin/apr-1-config
+	$(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/apr-1-config
+	$(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/apr-1-config
+	$(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apr-1-config
+	$(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apr-1-config
+	$(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' $(1)/usr/share/build-1/apr_rules.mk
 endef
 
-define Package/apr/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/apr-1-config $(1)/usr/bin/
+define Package/libapr/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libapr-1.so.* $(1)/usr/lib/
 endef
 
-$(eval $(call BuildPackage,apr))
+$(eval $(call BuildPackage,libapr))