From 4a298f0c8d7b2ba1bfad3e2e6c2e9a0765dc2634 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 27 Dec 2007 02:10:23 +0000
Subject: [PATCH] move libtool out of tools/, seems like we need a per-target
 libtool

SVN-Revision: 9937
---
 package/libtool/Makefile                      | 46 +++++++++++++++++++
 .../patches/001-force_dlopen_deplibs.patch    |  0
 tools/libtool/Makefile                        | 43 -----------------
 3 files changed, 46 insertions(+), 43 deletions(-)
 create mode 100644 package/libtool/Makefile
 rename {tools => package}/libtool/patches/001-force_dlopen_deplibs.patch (100%)
 delete mode 100644 tools/libtool/Makefile

diff --git a/package/libtool/Makefile b/package/libtool/Makefile
new file mode 100644
index 0000000000..1aad641986
--- /dev/null
+++ b/package/libtool/Makefile
@@ -0,0 +1,46 @@
+# 
+# Copyright (C) 2006 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:=libtool
+PKG_VERSION:=1.5.22
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@GNU/libtool
+PKG_MD5SUM:=8e0ac9797b62ba4dcc8a2fb7936412b0
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+CONFIGURE_PREFIX=$(STAGING_DIR)/host
+
+define Package/libltdl
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=A generic dynamic object loading library
+  URL:=http://www.gnu.org/software/libtool/
+endef
+
+define Build/InstallDev
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		prefix="$(2)" \
+		exec_prefix="$(2)" \
+		install
+	$(INSTALL_DIR) $(1)/lib
+	mv $(2)/lib/* $(1)/lib/
+endef
+
+define Package/libltdl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libltdl/.libs/libltdl.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libltdl))
diff --git a/tools/libtool/patches/001-force_dlopen_deplibs.patch b/package/libtool/patches/001-force_dlopen_deplibs.patch
similarity index 100%
rename from tools/libtool/patches/001-force_dlopen_deplibs.patch
rename to package/libtool/patches/001-force_dlopen_deplibs.patch
diff --git a/tools/libtool/Makefile b/tools/libtool/Makefile
deleted file mode 100644
index ad2bcd4f4e..0000000000
--- a/tools/libtool/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# 
-# Copyright (C) 2006 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:=libtool
-PKG_VERSION:=1.5.22
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@GNU/libtool
-PKG_MD5SUM:=8e0ac9797b62ba4dcc8a2fb7936412b0
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/host-build.mk
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--disable-shared \
-		--disable-static \
-	)
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)
-endef
-
-define Build/Install
-	$(MAKE) -C $(PKG_BUILD_DIR) install
-endef
-
-define Build/Clean
-	$(MAKE) -C $(PKG_BUILD_DIR) uninstall clean 
-	$(call Build/Clean/Default)
-endef
-
-$(eval $(call HostBuild))