gnupg:

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

diff --git a/libs/apr/Makefile b/libs/apr/Makefile
index 27bd72a0805bf6e626be1b751688a12a5c8e1499..1b170a749403796f4f27b3de1e28327ee74df22d 100644 (file)
--- a/libs/apr/Makefile
+++ b/libs/apr/Makefile
@@ -4,17 +4,17 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $ Id: $ 
+# $Id$ 
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apr
-PKG_VERSION:=0.9.13
+PKG_VERSION:=1.2.9
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://apache.d-s-s-p.de/apr/
-PKG_MD5SUM:=233894af598d8347fd68cf836e7dee91
+PKG_MD5SUM:=6f4b063ac01a54ba0818c31280f06959
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -32,55 +32,53 @@ define Package/apr
   URL:=http://apr.apache.org/
 endef
 
-define Build/Configure 
-       $(call Build/Configure/Default, \
+CONFIGURE_ARGS += \
                --with-devrandom=/dev/urandom \
                --disable-dso \
-               --disable-ipv6 \
-               , \
+               --disable-ipv6
+
+CONFIGURE_VARS += \
                ac_cv_file__dev_zero=yes \
-               ac_cv_sizeof_ssize_t=4 \
-               ac_cv_define_PTHREAD_PROCESS_SHARED=no \
+               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
+               CFLAGS="-I$(STAGING_DIR)/include $(TARGET_CFLAGS)"
 
-define Build/Compile   
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
+MAKE_FLAGS += \
+       DESTDIR="$(PKG_INSTALL_DIR)" \
+       all install
 
 define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/bin
-       $(CP)   $(PKG_INSTALL_DIR)/usr/bin/apr-config \
+       $(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-0/ \
+       $(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/ \
+       $(CP)   $(PKG_INSTALL_DIR)/usr/share/build-1/ \
                $(STAGING_DIR)/usr/share/
-       $(SED) "s,/usr/share/build,$(STAGING_DIR)/usr/share/build," $(STAGING_DIR)/usr/share/build/apr_rules.mk
-       $(SED)  "s,\"/usr\",$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/bin/apr-config
-       $(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libapr-0.la
+       $(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/include/apr-0/{apr_allocator.h,apr_atomic.h,apr_compat.h,apr_dso.h,apr_env.h,apr_errno.h,apr_file_info.h,apr_file_io.h,apr_fnmatch.h,apr_general.h,apr_getopt.h,apr_global_mutex.h,apr.h,apr_hash.h,apr_inherit.h,apr_lib.h,apr_mmap.h,apr_network_io.h,apr_poll.h,apr_pools.h,apr_portable.h,\apr_proc_mutex.h,\apr_ring.h,apr_shm.h,apr_signal.h,apr_strings.h,apr_support.h,apr_tables.h,apr_thread_cond.h,apr_thread_mutex.h,apr_thread_proc.h,apr_thread_rwlock.h,apr_time.h,apr_user.h,apr_version.h,apr_want.h} \
-               $(STAGING_DIR)/usr/lib/libapr-0* \
-               $(STAGING_DIR)/usr/share/build/{apr_rules.mk,libtool,make_exports.awk,make_var_export.awk,mkdir.sh}
+       rm -rf  $(STAGING_DIR)/usr/bin/apr-1-config \
+               $(STAGING_DIR)/usr/lib/{libapr-1*,apr.exp} \
+               $(STAGING_DIR)/usr/share/build-1/ \
+               $(STAGING_DIR)/usr/include/apr-1/
 endef
 
 define Package/apr/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/apr-config $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
 endef