packages/luaexpat: fix whitespaces

[packages.git] / libs / apr-util / Makefile

diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile
index 81acff5..fb34a55 100644 (file)
--- a/libs/apr-util/Makefile
+++ b/libs/apr-util/Makefile
@@ -1,31 +1,38 @@
 #
-# 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-util
-PKG_VERSION:=1.2.8
-PKG_RELEASE:=1
+PKG_VERSION:=1.3.12
+PKG_RELEASE:=2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://apache.autinity.de/apr/
-PKG_MD5SUM:=a2e2e54d65e9eae961f7171335cf2550
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://www.ibiblio.org/pub/mirrors/apache/apr
+PKG_MD5SUM:=0f671b037ca62751a8a7005578085560
+
+PKG_FIXUP:=autoreconf
+PKG_REMOVE_FILES:=aclocal.m4 build/ltmain.sh
+
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/libaprutil
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=+libapr +libexpat +libiconv +libpthread +libsqlite3
+  DEPENDS:=+libapr +libexpat +libsqlite3 +libuuid $(ICONV_DEPENDS)
   TITLE:=Apache Portable Runtime Utility Library
   URL:=http://apr.apache.org/
 endef
 
+TARGET_CFLAGS += $(FPIC)
+TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
 
 CONFIGURE_ARGS += \
        --with-pgsql=no \
@@ -33,50 +40,34 @@ CONFIGURE_ARGS += \
        --with-expat="$(STAGING_DIR)/usr" \
        --without-sqlite2 \
        --with-sqlite3="$(STAGING_DIR)/usr" \
-       --with-iconv="$(STAGING_DIR)/usr/lib/libiconv" \
+       --with-iconv="$(ICONV_PREFIX)" \
 
 CONFIGURE_VARS += \
        ac_cv_file_dbd_apr_dbd_mysql_c=no \
+       ac_cv_path_ODBC_CONFIG= \
        APR_BUILD_DIR="$(STAGING_DIR)/usr/share/build-1" \
 
-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
+MAKE_FLAGS += \
+       APRUTIL_LIBS="-lsqlite3 $(TARGET_LDFLAGS) -lexpat $(if $(ICONV_FULL),-liconv) -lapr-1 -luuid -lm -lcrypt" \
 
 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/
        $(CP)   $(PKG_INSTALL_DIR)/usr/bin/apu-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/libaprutil-1.{a,so*} \
+       $(CP)   $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \
                $(1)/usr/lib/
-       mkdir -p $(1)/usr/lib/pkgconfig/
        $(CP)   $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \
                $(1)/usr/lib/pkgconfig/
        $(SED) 's, -e \"s -I$$$$prefix/lib  g\",,g' $(1)/usr/bin/apu-1-config
-       $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(1)/usr/include/,g' $(1)/usr/bin/apu-1-config
+       $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/apu-1-config
+       $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/apu-1-config
        $(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apu-1-config
        $(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apu-1-config
 endef
 
-define Build/UninstallDev
-       rm -rf  $(STAGING_DIR)/usr/bin/apu-1-config \
-               $(STAGING_DIR)/usr/include/apr-1 \
-               $(STAGING_DIR)/usr/lib/libaprutil-1.{a,so*} \
-               $(STAGING_DIR)/usr/lib/pkgconfig/apr-util-1.pc
-endef
-
-define Package/libaprutil/install      
+define Package/libaprutil/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.so.* $(1)/usr/lib/
 endef