From patchwork Mon Jan 4 00:34:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 562216 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 10F931402DD for ; Mon, 4 Jan 2016 11:35:29 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id F39E3281070; Mon, 4 Jan 2016 01:34:44 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 900BF28089B; Mon, 4 Jan 2016 01:34:34 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by arrakis.dune.hu (Postfix) with ESMTPS; Mon, 4 Jan 2016 01:34:32 +0100 (CET) Received: from LT001.fritz.box ([37.24.8.189]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0LsTDk-1a4mGv3XZ2-0124NQ; Mon, 04 Jan 2016 01:34:57 +0100 From: Heinrich Schuchardt To: openwrt-devel@lists.openwrt.org Date: Mon, 4 Jan 2016 01:34:50 +0100 Message-Id: <1451867690-19674-1-git-send-email-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1451865391-4122-1-git-send-email-xypron.glpk@gmx.de> References: <1451865391-4122-1-git-send-email-xypron.glpk@gmx.de> X-Provags-ID: V03:K0:DXOgMuIE9MZ14P4pKOkGmvHTkXVeSWxkzUSSllo6emBUa1Cl6Sb jMQwUvrv63iHGfLSPbp/OlDRQ7qpgHIIQiYWJYb9QXteE7yjHXzT0cUe8MXhtsTxfP0dp+2 M9u1c+qhVXB31GVKY4MStHhvZ+LB89ail2dBHW4wTulsgWGj+YBYvpFaho2sdc5vWYyxTi6 AZ5LthYexWO8Wlk3rTvIw== X-UI-Out-Filterresults: notjunk:1; V01:K0:AqcG7PXEVvQ=:85UQ2rYqVRZ9tZv7iR+OYU y21rauxKRN38L2pmlMvTVS0DtdG975eaetj9jocUnnTwpsgd/TYTLVHs9oxk+HpJ7akpK3w1s WP5YMbLyP/hVBAv0m9B09VHhZoZRk3DQlwMmtypE5VpZOwN1ZNGsJO8bO+wGrIrRML3byguUY +U1DYFhXOUaUNfhzQSbUh+QsxFhCZkzSvEFlYu/4OaNGGOTyv5iBKofOiKuf9S3f6YzMY1+Aw SOphB0wJFT2MarjTZpjKbHgrt/E6zaCttPrFVWT/QGcmfpNCu8nl5HN9XhC7ego6RIeX3bCFh XAnLAUSgxQZypjdaO+77YGuFgoB3embMZa2NIuCx6bnMo9g/l3K1zFtryI22o9zo2vBLfzLkG HHX9BttoYSLFUTZh7m1z56FR1c+8L9jrorfClwWca9IlBER0p66rXam11h4DSD5WW5YTyjvZB +qQElpoHrTLs4uIFz8vq0B2UVqWFBHXMI2WnIelFAzCbYemJEyd9U+/+3TyD5UHtzWjKnt8NN /rE513OXaDItE3VTE7+BYHSgbqWFMgAky+HS3ZPB+okeEmGPZnhbpnAhyinVhajFdJ0W8n0XF 24/EFbxwW8ZpFUOTrSNuWUSZOTb+jEDtryWHGLsdScJPBWTcCauKsMR82jxmqYkUKgbv3ae/C V1K4oO7ef2OdvuCP1gIJNy9lGORNrpUxd/7WG91jPcE1wgQ6ITJriKFBUgfXt+EcNUJYF512W F3bwqghL93VgohSoeAIn9tRAyzyYMy1ZAtBmbwcgAuCbc14Le26O8XsJaNc= Cc: Heinrich Schuchardt Subject: [OpenWrt-Devel] [PATCH 1/1 v2] package/libs/libtool: rename to libltdl X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Source package libtool is used to package libltdl. Unfortunately binary libtoolize is missing. Packaging libtoolize would depend on package file which is in the packages feed. Felix Fietkau suggested to rename source libtool to libltdl and to create a new package libtool in packages. This patch contains the renaming. version 2 Renaming must occur inside Makefile too. Signed-off-by: Heinrich Schuchardt --- package/libs/libltdl/Makefile | 60 ++++++++++++++++++++++ .../libs/libltdl/patches/160-passthrough-ssp.patch | 11 ++++ package/libs/libtool/Makefile | 52 ------------------- .../libs/libtool/patches/160-passthrough-ssp.patch | 11 ---- 4 files changed, 71 insertions(+), 63 deletions(-) create mode 100644 package/libs/libltdl/Makefile create mode 100644 package/libs/libltdl/patches/160-passthrough-ssp.patch delete mode 100644 package/libs/libtool/Makefile delete mode 100644 package/libs/libtool/patches/160-passthrough-ssp.patch diff --git a/package/libs/libltdl/Makefile b/package/libs/libltdl/Makefile new file mode 100644 index 0000000..3401caa --- /dev/null +++ b/package/libs/libltdl/Makefile @@ -0,0 +1,60 @@ +# +# 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:=libltdl +PKG_VERSION:=2.4 +PKG_RELEASE:=1 + +PKG_SOURCE:=libtool-$(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/Prepare + rm -rf $(PKG_BUILD_DIR) + mkdir -p $(PKG_BUILD_DIR) + $(TAR) -C $(PKG_BUILD_DIR) \ + -xzf $(DL_DIR)/libtool-$(PKG_VERSION).tar.gz --strip 1 + $(Build/Patch) +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)) diff --git a/package/libs/libltdl/patches/160-passthrough-ssp.patch b/package/libs/libltdl/patches/160-passthrough-ssp.patch new file mode 100644 index 0000000..6fcbe68 --- /dev/null +++ b/package/libs/libltdl/patches/160-passthrough-ssp.patch @@ -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" diff --git a/package/libs/libtool/Makefile b/package/libs/libtool/Makefile deleted file mode 100644 index 8091081..0000000 --- a/package/libs/libtool/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -# 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)) diff --git a/package/libs/libtool/patches/160-passthrough-ssp.patch b/package/libs/libtool/patches/160-passthrough-ssp.patch deleted file mode 100644 index 6fcbe68..0000000 --- a/package/libs/libtool/patches/160-passthrough-ssp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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"