Author: nbd Date: 2016-01-10 12:39:19 +0100 (Sun, 10 Jan 2016) New Revision: 48169
Added: trunk/package/libs/libtool/ trunk/package/libs/libtool/Makefile trunk/package/libs/libtool/patches/ trunk/package/libs/libtool/patches/160-passthrough-ssp.patch Removed: trunk/package/libs/libltdl/ Log: Revert "package/libs/libtool: rename to libltdl" This reverts commit r48149 Signed-off-by: Felix Fietkau <[email protected]> Copied: trunk/package/libs/libtool/Makefile (from rev 48158, trunk/package/libs/libltdl/Makefile) =================================================================== --- trunk/package/libs/libtool/Makefile (rev 0) +++ trunk/package/libs/libtool/Makefile 2016-01-10 11:39:19 UTC (rev 48169) @@ -0,0 +1,52 @@ +# +# 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:=2.4 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@GNU/libtool +PKG_MD5SUM:=b32b04148ecdd7344abc6fe8bd1bb021 + +PKG_LICENSE:=GPL-2.0+ +PKG_LICENSE_FILES:=COPYING + +PKG_BUILD_PARALLEL:=0 + +include $(INCLUDE_DIR)/package.mk + +CONFIGURE_PREFIX=$(STAGING_DIR)/host +export GLOBAL_LIBDIR=$(STAGING_DIR)/usr/lib + +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) \ + 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/ +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)) Copied: trunk/package/libs/libtool/patches/160-passthrough-ssp.patch (from rev 48158, trunk/package/libs/libltdl/patches/160-passthrough-ssp.patch) =================================================================== --- trunk/package/libs/libtool/patches/160-passthrough-ssp.patch (rev 0) +++ trunk/package/libs/libtool/patches/160-passthrough-ssp.patch 2016-01-10 11:39:19 UTC (rev 48169) @@ -0,0 +1,11 @@ +--- a/libltdl/config/ltmain.m4sh ++++ b/libltdl/config/ltmain.m4sh +@@ -5051,7 +5051,7 @@ func_mode_link () + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ +- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) ++ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) + func_quote_for_eval "$arg" + arg="$func_quote_for_eval_result" + func_append compile_command " $arg" _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
