update to 0.2

[openwrt/svn-archive/archive.git] / libs / libtool / Makefile

diff --git a/libs/libtool/Makefile b/libs/libtool/Makefile
index d3b03f9617e10de2eca49c6bfea2b88dee026ac1..ee7cf1be080dfa205a8d3382d250b62495e070c2 100644 (file)
--- a/libs/libtool/Makefile
+++ b/libs/libtool/Makefile
@@ -9,15 +9,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtool
-PKG_VERSION:=1.5.14
+PKG_VERSION:=1.5.22
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/libtool
-PKG_MD5SUM:=049bf67de9b0eb75cd943dafe3d749ec
+PKG_MD5SUM:=8e0ac9797b62ba4dcc8a2fb7936412b0
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,71 +26,54 @@ define Package/libltdl
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A generic dynamic object loading library
-  DESCRIPTION:=A generic dynamic object loading library.
   URL:=http://www.gnu.org/software/libtool/
 endef
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); rm -rf config.cache; \
-               touch libltdl/configure.ac; \
-               touch libltdl/acinclude.m4; \
-               touch libltdl/aclocal.m4; \
-               touch libltdl/Makefile.in; \
-               touch libltdl/config-h.in; \
-               touch libltdl/configure; \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
-               ./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 \
+       (cd $(PKG_BUILD_DIR); touch \
+               libltdl/configure.ac \
+               libltdl/acinclude.m4 \
+               libltdl/aclocal.m4 \
+               libltdl/Makefile.in \
+               libltdl/config-h.in \
+               libltdl/configure \
        );
+       $(call Build/Configure/Default, \
+               --enable-shared \
+               --enable-static \
+       )
 endef
 
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 
-define Package/libltdl/install
-       install -m0755 -d $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libltdl.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
+       mkdir -p $(STAGING_DIR)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/libtool $(STAGING_DIR)/usr/bin/
        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/
+       mkdir -p $(STAGING_DIR)/usr/share/libtool
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/libtool/config.guess $(STAGING_DIR)/usr/share/libtool/
+       $(SED) 's|^sys_lib_dlsearch_path_spec=.*|sys_lib_dlsearch_path_spec="$(STAGING_DIR)/usr/lib $(STAGING_DIR)/lib"|g' \
+               $(STAGING_DIR)/usr/bin/libtool
 endef
 
 define Build/UninstallDev
        rm -rf \
+               $(STAGING_DIR)/usr/bin/libtool \
                $(STAGING_DIR)/usr/include/ltdl.h \
-               $(STAGING_DIR)/usr/lib/libltdl.{a,so*}
+               $(STAGING_DIR)/usr/lib/libltdl.{a,so*} \
+               $(STAGING_DIR)/usr/share/libtool
+endef
+
+define Package/libltdl/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libltdl.so.* $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libltdl))