firewall: fix fallout from r18716 (fixes #6338)

[openwrt.git] / package / libtool / Makefile

diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index f84d171..e5d1172 100644 (file)
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -1,79 +1,56 @@
-# $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
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtool

-PKG_VERSION:=1.5.14
+PKG_VERSION:=1.5.26

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=049bf67de9b0eb75cd943dafe3d749ec

 
 

-PKG_SOURCE_URL:=@GNU/libtool

 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

-PKG_CAT:=zcat
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-include $(TOPDIR)/package/rules.mk
-
-$(eval $(call PKG_template,LIBLTDL,libltdl,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-
-$(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 $@
+PKG_SOURCE_URL:=@GNU/libtool
+PKG_MD5SUM:=aa9c5107f3ec9ef4200eb6556f3b3c29

 
 

-$(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 $@
+HOST_PATCH_DIR=/dev/null

 
 

-$(IPKG_LIBLTDL):
-       install -m0755 -d $(IDIR_LIBLTDL)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libltdl.so.* $(IDIR_LIBLTDL)/usr/lib/
-       $(RSTRIP) $(IDIR_LIBLTDL)
-       $(IPKG_BUILD) $(IDIR_LIBLTDL) $(PACKAGE_DIR)
+PKG_BUILD_DEPENDS:=libtool/host

 
 

-$(STAGING_DIR)/usr/lib/libltdl.so: $(PKG_BUILD_DIR)/.built
-       mkdir -p $(STAGING_DIR)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/ltdl.h $(STAGING_DIR)/usr/include/
-       mkdir -p $(I_LIBLTDL_DEV)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libltdl.{a,so*} $(STAGING_DIR)/usr/lib/
-       touch $@
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk

 
 

-install-dev: $(STAGING_DIR)/usr/lib/libltdl.so
+CONFIGURE_PREFIX=$(STAGING_DIR)/host
+export GLOBAL_LIBDIR=$(STAGING_DIR)/usr/lib

 
 

-uninstall-dev:
-       rm -rf \
-               $(STAGING_DIR)/usr/include/ltdl.h \
-               $(STAGING_DIR)/usr/lib/libltdl.{a,so*} \
+define Package/libltdl
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=A generic dynamic object loading library
+  URL:=http://www.gnu.org/software/libtool/
+endef

 
 

-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))