From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 634D9138454 for ; Fri, 11 Sep 2015 18:11:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0A340E080E; Fri, 11 Sep 2015 18:11:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8FB31E080E for ; Fri, 11 Sep 2015 18:11:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 256FC340AEF for ; Fri, 11 Sep 2015 18:11:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 94850182 for ; Fri, 11 Sep 2015 18:11:00 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1441995054.840e66d340d39348cf401d8079138b7ed5676354.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/libtool/, sys-devel/libtool/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/libtool/files/libtool-2.4.6-fuse-ld.patch sys-devel/libtool/libtool-2.4.6-r1.ebuild sys-devel/libtool/libtool-9999.ebuild X-VCS-Directories: sys-devel/libtool/files/ sys-devel/libtool/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 840e66d340d39348cf401d8079138b7ed5676354 X-VCS-Branch: master Date: Fri, 11 Sep 2015 18:11:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9823fb5f-a046-4126-9aea-bf6d574c4540 X-Archives-Hash: 9e42ffc826ba5c7ea96f579c4e5d581a commit: 840e66d340d39348cf401d8079138b7ed5676354 Author: Mike Frysinger gentoo org> AuthorDate: Fri Sep 11 17:26:51 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Fri Sep 11 18:10:54 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=840e66d3 sys-devel/libtool: force disable help2man w/releases #556512 We want to make sure that help2man isn't run inadvertently (since we explicitly do not depend on it w/releases), so set HELP2MAN to `false` so it hard fails immediately. We also fix the build-aux/ltmain.in patch as it triggers rebuilding of build-aux/ltmain.sh which triggers rebuilding of doc/libtool.1 which requires `help2man`. sys-devel/libtool/files/libtool-2.4.6-fuse-ld.patch | 21 ++++++++++++++++++++- sys-devel/libtool/libtool-2.4.6-r1.ebuild | 6 ++++++ sys-devel/libtool/libtool-9999.ebuild | 6 ++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/sys-devel/libtool/files/libtool-2.4.6-fuse-ld.patch b/sys-devel/libtool/files/libtool-2.4.6-fuse-ld.patch index eb8ee07..c352d52 100644 --- a/sys-devel/libtool/files/libtool-2.4.6-fuse-ld.patch +++ b/sys-devel/libtool/files/libtool-2.4.6-fuse-ld.patch @@ -29,6 +29,25 @@ index d5cf07a..0fc8279 100644 func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" + +patch the generated file too to keep help2man from generating man pages +https://bugs.gentoo.org/556512 + +--- a/build-aux/ltmain.sh ++++ b/build-aux/ltmain.sh +@@ -5360,10 +5360,12 @@ func_mode_link () + # -tp=* Portland pgcc target processor selection + # --sysroot=* for sysroot support + # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization ++ # -fuse-ld=* Linker select flags for GCC + # -stdlib=* select c++ std lib with clang + -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*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*) ++ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ ++ -fuse-ld=*) + func_quote_for_eval "$arg" + arg=$func_quote_for_eval_result + func_append compile_command " $arg" -- 2.3.2 - diff --git a/sys-devel/libtool/libtool-2.4.6-r1.ebuild b/sys-devel/libtool/libtool-2.4.6-r1.ebuild index 5dbc9f9..677db33 100644 --- a/sys-devel/libtool/libtool-2.4.6-r1.ebuild +++ b/sys-devel/libtool/libtool-2.4.6-r1.ebuild @@ -53,6 +53,12 @@ src_prepare() { popd >/dev/null AT_NOELIBTOOLIZE=yes eautoreconf epunt_cxx + + # Make sure timestamps don't trigger a rebuild of man pages. #556512 + if [[ ${PV} != "9999" ]] ; then + touch doc/*.1 + export HELP2MAN=false + fi } src_configure() { diff --git a/sys-devel/libtool/libtool-9999.ebuild b/sys-devel/libtool/libtool-9999.ebuild index 923f8b4..8b6ede5 100644 --- a/sys-devel/libtool/libtool-9999.ebuild +++ b/sys-devel/libtool/libtool-9999.ebuild @@ -50,6 +50,12 @@ src_prepare() { popd >/dev/null AT_NOELIBTOOLIZE=yes eautoreconf epunt_cxx + + # Make sure timestamps don't trigger a rebuild of man pages. #556512 + if [[ ${PV} != "9999" ]] ; then + touch doc/*.1 + export HELP2MAN=false + fi } src_configure() {