X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Flibtool%2FMakefile;h=f105ffd81f61a1405d3107f62d36b9988a9aecf9;hb=283e9033a520bb575fdeefec939662ca7694cf55;hp=ac74a25e9f540f10b226f84bf3938ba8e8a45b7b;hpb=6b53157103d462f7ea0b81f9fe77412719ea2260;p=openwrt.git

diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index ac74a25e9f..f105ffd81f 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -1,82 +1,59 @@
-# $Id$
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtool
-PKG_VERSION:=1.5.14
+PKG_VERSION:=2.4
 PKG_RELEASE:=1
-PKG_MD5SUM:=049bf67de9b0eb75cd943dafe3d749ec
 
-PKG_SOURCE_URL:=http://ftp.gnu.org/gnu/libtool/ \
-	ftp://ftp.belnet.be/mirror/ftp.gnu.org/gnu/libtool/ \
-	ftp://ftp.mirror.nl/pub/mirror/gnu/libtool/ \
-	http://mirror.switch.ch/ftp/mirror/gnu/libtool/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_CAT:=zcat
+PKG_SOURCE_URL:=@GNU/libtool
+#PKG_MD5SUM:=aa9c5107f3ec9ef4200eb6556f3b3c29
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+HOST_PATCH_DIR=/dev/null
 
-include $(TOPDIR)/package/rules.mk
+PKG_BUILD_DEPENDS:=libtool/host
 
-$(eval $(call PKG_template,LIBLTDL,libltdl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+PKG_BUILD_PARALLEL:=0
+HOST_BUILD_PARALLEL:=0
 
-$(PKG_BUILD_DIR)/.configured:
-	(cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
-		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		./configure \
-		  --target=$(GNU_TARGET_NAME) \
-		  --host=$(GNU_TARGET_NAME) \
-		  --build=$(GNU_HOST_NAME) \
-		  --program-prefix="" \
-		  --program-suffix="" \
-		  --prefix=/usr \
-		  --exec-prefix=/usr \
-		  --bindir=/usr/bin \
-		  --datadir=/usr/share \
-		  --includedir=/usr/include \
-		  --infodir=/usr/share/info \
-		  --libdir=/usr/lib \
-		  --libexecdir=/usr/lib \
-		  --localstatedir=/var \
-		  --mandir=/usr/share/man \
-		  --sbindir=/usr/sbin \
-		  --sysconfdir=/etc \
-		  $(DISABLE_NLS) \
-		  $(DISABLE_LARGEFILE) \
-		  --enable-shared \
-		  --enable-static \
-	);
-	touch $@
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
 
-$(PKG_BUILD_DIR)/.built:
-	rm -rf $(PKG_INSTALL_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all install
-	touch $@
-
-$(IPKG_LIBLTDL):
-	install -m0755 -d $(IDIR_LIBLTDL)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libltdl.so.* $(IDIR_LIBLTDL)/usr/lib/
-	$(RSTRIP) $(IDIR_LIBLTDL)
-	$(IPKG_BUILD) $(IDIR_LIBLTDL) $(PACKAGE_DIR)
-
-$(STAGING_DIR)/usr/lib/libltdl.so: $(PKG_BUILD_DIR)/.built
-	mkdir -p $(STAGING_DIR)/usr/include
-	cp -fpR $(PKG_INSTALL_DIR)/usr/include/ltdl.h $(STAGING_DIR)/usr/include/
-	mkdir -p $(I_LIBLTDL_DEV)/usr/lib
-	cp -fpR $(PKG_INSTALL_DIR)/usr/lib/libltdl.{a,so*} $(STAGING_DIR)/usr/lib/
-	touch $@
+CONFIGURE_PREFIX=$(STAGING_DIR)/host
+export GLOBAL_LIBDIR=$(STAGING_DIR)/usr/lib
 
-install-dev: $(STAGING_DIR)/usr/lib/libltdl.so
+define Package/libltdl
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=A generic dynamic object loading library
+  URL:=http://www.gnu.org/software/libtool/
+endef
 
-uninstall-dev:
-	rm -rf \
-		$(STAGING_DIR)/usr/include/ltdl.h \
-		$(STAGING_DIR)/usr/lib/libltdl.{a,so*} \
-
-compile-targets: install-dev
-clean-targets: uninstall-dev
+define Build/InstallDev
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		bindir="$(2)/bin" \
+		datadir="$(2)/share" \
+		prefix="$(2)" \
+		exec_prefix="$(2)" \
+		install
+	$(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include
+	mv $(2)/lib/* $(1)/usr/lib/
+	mv $(2)/include/* $(1)/usr/include/
+	$(SED) 's,\(hardcode_into_libs\)=yes,\1=no,g' $(2)/bin/libtool
+	$(CP) $(2)/bin/libtool $(2)/bin/libtool-ucxx
+	$(SED) 's,-lstdc++,-luClibc++,g' $(2)/bin/libtool-ucxx
+endef
+
+define Package/libltdl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libltdl/.libs/libltdl.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,libltdl))