[packages] apr: ensure rlimit support, fixes httpd mod_cgi link failures, upstream...

[openwrt/svn-archive/archive.git] / libs / apr / Makefile

diff --git a/libs/apr/Makefile b/libs/apr/Makefile
index 2b5f3e9dd43dc3aef94fc8ad375f9e493a9c7f2b..91776bde538f4aadef37be63dbfae3b8a56a0e0c 100644 (file)
--- a/libs/apr/Makefile
+++ b/libs/apr/Makefile
@@ -1,85 +1,69 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2011 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.9
+PKG_VERSION:=1.4.5
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://apache.d-s-s-p.de/apr/
-PKG_MD5SUM:=6f4b063ac01a54ba0818c31280f06959
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.ibiblio.org/pub/mirrors/apache/apr
+PKG_MD5SUM:=8b53f5a5669d0597f2da889a2f576eb6
+
+PKG_FIXUP:=autoreconf
+PKG_REMOVE_FILES:=aclocal.m4 build/ltmain.sh
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libapr
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libpthread
+  DEPENDS:=+libpthread +librt
   TITLE:=Apache Portable Runtime Library
   URL:=http://apr.apache.org/
 endef
 
+TARGET_CFLAGS += $(FPIC)
 CONFIGURE_ARGS += \
        --with-devrandom=/dev/urandom \
        --disable-dso \
-       --disable-ipv6
+       --enable-ipv6
 
+# XXX: ac_cv_sizeof_struct_iovec=1 is just to trick configure
 CONFIGURE_VARS += \
-       ac_cv_file__dev_zero=yes \
+       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 \
-       ac_cv_sizeof_ssize_t=4 \
+       ac_cv_struct_rlimit=yes \
        LDFLAGS="$$$$LDFLAGS -lpthread" \
 
-define Build/Configure
-       $(call Build/Configure/Default)
-       $(call libtool_disable_rpath)
-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
-endef
-
 define Build/InstallDev
-       mkdir -p $(1)/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 \
-               $(1)/usr/bin
-       mkdir -p $(1)/usr/include/apr-1
+               $(1)/usr/bin/
        $(CP)   $(PKG_INSTALL_DIR)/usr/include/apr-1/* \
                $(1)/usr/include/apr-1/
-       mkdir -p $(1)/usr/lib
-       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{a,so*} \
+       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libapr-1.{la,a,so*} \
                $(1)/usr/lib/
-       mkdir -p $(1)/usr/lib/pkgconfig
        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-1.pc \
                $(1)/usr/lib/pkgconfig/
-       mkdir -p $(1)/usr/share/build-1
        $(CP)   $(PKG_INSTALL_DIR)/usr/share/build-1/* \
                $(1)/usr/share/build-1/
-       $(SED) 's,^datadir=\"/usr/share\",datadir=\"$(1)/usr/share\",g' $(1)/usr/bin/apr-1-config
-       $(SED) 's,^installbuilddir=\"/usr/share/build-1\",installbuilddir=\"$(1)/usr/share/build-1\",g' $(1)/usr/bin/apr-1-config
-       $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(1)/usr/bin/apr-1-config
+       $(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,$(1)/usr/share/build-1,g' $(1)/usr/share/build-1/apr_rules.mk
-endef
-
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/bin/apr-1-config \
-               $(STAGING_DIR)/usr/include/apr-1 \
-               $(STAGING_DIR)/usr/lib/libapr-1.{a,so*} \
-               $(STAGING_DIR)/usr/lib/pkgconfig/apr-1.pc \
-               $(STAGING_DIR)/usr/share/build-1
+       $(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' $(1)/usr/share/build-1/apr_rules.mk
 endef
 
 define Package/libapr/install