From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 10 Oct 2007 15:24:42 +0000 (+0000)
Subject: [packages] apr-util: move from utils/ to libs/
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=ce7dd504994907a14d090da55c1470bc4f8bc427;p=packages.git

[packages] apr-util: move from utils/ to libs/


git-svn-id: svn://svn.openwrt.org/openwrt/packages@9248 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile
new file mode 100644
index 000000000..81acff550
--- /dev/null
+++ b/libs/apr-util/Makefile
@@ -0,0 +1,84 @@
+#
+# Copyright (C) 2007 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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://apache.autinity.de/apr/
+PKG_MD5SUM:=a2e2e54d65e9eae961f7171335cf2550
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libaprutil
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+libapr +libexpat +libiconv +libpthread +libsqlite3
+  TITLE:=Apache Portable Runtime Utility Library
+  URL:=http://apr.apache.org/
+endef
+
+
+CONFIGURE_ARGS += \
+	--with-pgsql=no \
+	--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
+	--with-expat="$(STAGING_DIR)/usr" \
+	--without-sqlite2 \
+	--with-sqlite3="$(STAGING_DIR)/usr" \
+	--with-iconv="$(STAGING_DIR)/usr/lib/libiconv" \
+
+CONFIGURE_VARS += \
+	ac_cv_file_dbd_apr_dbd_mysql_c=no \
+	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
+
+define Build/InstallDev
+	mkdir -p $(1)/usr/bin
+	$(CP)   $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \
+	 	$(1)/usr/bin
+	mkdir -p $(1)/usr/include/apr-1/
+	$(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*} \
+		$(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,-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	
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libaprutil))
diff --git a/utils/apr-util/Makefile b/utils/apr-util/Makefile
deleted file mode 100644
index 81acff550..000000000
--- a/utils/apr-util/Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Copyright (C) 2007 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_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://apache.autinity.de/apr/
-PKG_MD5SUM:=a2e2e54d65e9eae961f7171335cf2550
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libaprutil
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+libapr +libexpat +libiconv +libpthread +libsqlite3
-  TITLE:=Apache Portable Runtime Utility Library
-  URL:=http://apr.apache.org/
-endef
-
-
-CONFIGURE_ARGS += \
-	--with-pgsql=no \
-	--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
-	--with-expat="$(STAGING_DIR)/usr" \
-	--without-sqlite2 \
-	--with-sqlite3="$(STAGING_DIR)/usr" \
-	--with-iconv="$(STAGING_DIR)/usr/lib/libiconv" \
-
-CONFIGURE_VARS += \
-	ac_cv_file_dbd_apr_dbd_mysql_c=no \
-	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
-
-define Build/InstallDev
-	mkdir -p $(1)/usr/bin
-	$(CP)   $(PKG_INSTALL_DIR)/usr/bin/apu-1-config \
-	 	$(1)/usr/bin
-	mkdir -p $(1)/usr/include/apr-1/
-	$(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*} \
-		$(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,-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	
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libaprutil))