[gentoo-commits] repo/gentoo:master commit in: sys-devel/libtool/, sys-devel/libtool/files/

2023-01-30 Thread Sam James 
commit: fefbb1236959fa6ea619899f7d42c694bdc3e3bd
Author: Sam James  gentoo  org>
AuthorDate: Mon Jan 30 15:07:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jan 30 15:08:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fefbb123

sys-devel/libtool: fix tests w/ grep-3.8

Closes: https://bugs.gentoo.org/892635
Signed-off-by: Sam James  gentoo.org>

 .../libtool/files/libtool-2.4.7-grep-3.8.patch | 31 ++
 sys-devel/libtool/libtool-2.4.7-r1.ebuild  |  4 ++-
 sys-devel/libtool/libtool-.ebuild  |  6 +++--
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/sys-devel/libtool/files/libtool-2.4.7-grep-3.8.patch 
b/sys-devel/libtool/files/libtool-2.4.7-grep-3.8.patch
new file mode 100644
index ..8f1de478aece
--- /dev/null
+++ b/sys-devel/libtool/files/libtool-2.4.7-grep-3.8.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/892635
+https://lists.gnu.org/archive/html/libtool-patches/2022-12/msg4.html
+
+From 414deacee0f564afdf2d7750450274c581330a59 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= 
+Date: Wed, 21 Dec 2022 13:14:03 +0100
+Subject: [PATCH] tests: Fix grep warning about stray \ before /
+
+Recent version of grep emit a warning if stray \ is found before /.
+This leads to the link-order test failure.
+
+ * tests/link-order.at: Remove unneeded \ before /
+--- a/tests/link-order.at
 b/tests/link-order.at
+@@ -99,12 +99,12 @@ aix* | interix*) ;;  # These systems have different path 
syntax
+   case $hardcode_direct$hardcode_direct_absolute in
+   yesno)
+ AT_CHECK([if $EGREP relinking stderr; then
+- $EGREP " .*\/new\/lib/libb$shared_ext 
.*\/old\/lib/libcee$shared_ext" stdout
++ $EGREP " .*/new/lib/libb$shared_ext .*/old/lib/libcee$shared_ext" 
stdout
+else :; fi], [0], [ignore], [], [echo "wrong link order"])
+ ;;
+   *)
+ AT_CHECK([if $EGREP relinking stderr; then
+- $EGREP " -L.*\/new\/lib -lb -L.*\/old\/lib -lcee" stdout
++ $EGREP " -L.*/new/lib -lb -L.*/old/lib -lcee" stdout
+else :; fi], [0], [ignore], [], [echo "wrong link order"])
+ ;;
+   esac
+-- 
+2.38.1

diff --git a/sys-devel/libtool/libtool-2.4.7-r1.ebuild 
b/sys-devel/libtool/libtool-2.4.7-r1.ebuild
index 405ca5779a7a..f9db3294ea9e 100644
--- a/sys-devel/libtool/libtool-2.4.7-r1.ebuild
+++ b/sys-devel/libtool/libtool-2.4.7-r1.ebuild
@@ -30,7 +30,8 @@ RDEPEND="
sys-devel/gnuconfig
>=sys-devel/autoconf-2.69:*
>=sys-devel/automake-1.13:*
-   >=dev-libs/libltdl-2.4.7"
+   >=dev-libs/libltdl-2.4.7
+"
 DEPEND="${RDEPEND}"
 [[ ${PV} == * ]] && BDEPEND="sys-apps/help2man"
 
@@ -44,6 +45,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
"${FILESDIR}"/${PN}-2.4.7-werror-lto.patch
+   "${FILESDIR}"/${PN}-2.4.7-grep-3.8.patch
 )
 
 src_prepare() {

diff --git a/sys-devel/libtool/libtool-.ebuild 
b/sys-devel/libtool/libtool-.ebuild
index ae3d351ad479..17e669733130 100644
--- a/sys-devel/libtool/libtool-.ebuild
+++ b/sys-devel/libtool/libtool-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,8 @@ RDEPEND="
sys-devel/gnuconfig
>=sys-devel/autoconf-2.69:*
>=sys-devel/automake-1.13:*
-   >=dev-libs/libltdl-2.4.7"
+   >=dev-libs/libltdl-2.4.7
+"
 DEPEND="${RDEPEND}"
 [[ ${PV} == * ]] && BDEPEND="sys-apps/help2man"
 
@@ -43,6 +44,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.4.6-mint.patch
"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
+   "${FILESDIR}"/${PN}-2.4.7-grep-3.8.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sys-devel/libtool/, sys-devel/libtool/files/

2022-12-09 Thread Sam James 
commit: 2b258b6396f73a8c9065132834b273e2fbdd1556
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 10 02:42:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 10 02:43:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b258b63

sys-devel/libtool: add -Werror filtering patch

Needed to make -Werror=odr and such error out at link-time.

Bug: https://bugs.gentoo.org/884767
Signed-off-by: Sam James  gentoo.org>

 .../libtool/files/libtool-2.4.7-werror-lto.patch   |  45 
 sys-devel/libtool/libtool-2.4.7-r1.ebuild  | 116 +
 2 files changed, 161 insertions(+)

diff --git a/sys-devel/libtool/files/libtool-2.4.7-werror-lto.patch 
b/sys-devel/libtool/files/libtool-2.4.7-werror-lto.patch
new file mode 100644
index ..5a460e006be6
--- /dev/null
+++ b/sys-devel/libtool/files/libtool-2.4.7-werror-lto.patch
@@ -0,0 +1,45 @@
+From d72817b1ee5d7b666bf30b0234e32423252d6ad8 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sat, 10 Dec 2022 02:00:22 +
+Subject: [PATCH] Allow -Werror and -Werror=* through flag filtering
+
+* build-aux/ltmain.in (func_mode_link): allow -Werror and -Werror=* through
+  flat filtering at link time.
+
+  This is needed for detecting likely-runtime problems with LTO using
+  e.g. -Werror=odr or -Werror=lto-type-mismatch.
+
+Bug: https://bugs.gentoo.org/884767
+Signed-off-by: Sam James 
+--- a/build-aux/ltmain.in
 b/build-aux/ltmain.in
+@@ -5408,10 +5408,11 @@ func_mode_link ()
+   # -fsanitize=* Clang/GCC memory and address sanitizer
+   # -fuse-ld=*   Linker select flags for GCC
+   # -Wa,*Pass flags directly to the assembler
++  # -Werror, -Werror=*   Report (specified) warnings as errors
+   -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=*| \
+-  -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*)
++  -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*|-Werror|-Werror=*)
+ func_quote_arg pretty "$arg"
+   arg=$func_quote_arg_result
+ func_append compile_command " $arg"
+--- a/build-aux/ltmain.sh
 a/build-aux/ltmain.sh
+@@ -5408,10 +5408,11 @@ func_mode_link ()
+   # -fsanitize=* Clang/GCC memory and address sanitizer
+   # -fuse-ld=*   Linker select flags for GCC
+   # -Wa,*Pass flags directly to the assembler
++  # -Werror, -Werror=*   Report (specified) warnings as errors
+   -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=*| \
+-  -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*)
++  -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*|-Werror|-Werror=*)
+ func_quote_arg pretty "$arg"
+   arg=$func_quote_arg_result
+ func_append compile_command " $arg"
+-- 
+2.38.1

diff --git a/sys-devel/libtool/libtool-2.4.7-r1.ebuild 
b/sys-devel/libtool/libtool-2.4.7-r1.ebuild
new file mode 100644
index ..aa11623b7011
--- /dev/null
+++ b/sys-devel/libtool/libtool-2.4.7-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with dev-libs/libltdl.
+
+# bug #225559
+LIBTOOLIZE="true"
+WANT_LIBTOOL="none"
+inherit autotools prefix
+
+if [[ ${PV} == * ]] ; then
+   EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git;
+   inherit git-r3
+else
+   SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="https://www.gnu.org/software/libtool/;
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="vanilla"
+
+# Pull in libltdl directly until we convert packages to the new dep.
+RDEPEND="
+   sys-devel/gnuconfig
+   >=sys-devel/autoconf-2.69:*
+   >=sys-devel/automake-1.13:*
+   >=dev-libs/libltdl-2.4.7"
+DEPEND="${RDEPEND}"
+[[ ${PV} == * ]] && BDEPEND="sys-apps/help2man"
+
+PATCHES=(
+   # bug #109105
+   "${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch
+   # bug #581314
+   "${FILESDIR}"/${PN}-2.4.6-ppc64le.patch
+
+   "${FILESDIR}"/${PN}-2.4.6-mint.patch
+   "${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
+   "${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
+   "${FILESDIR}"/${PN}-2.4.7-werror-lto.patch
+)
+
+src_prepare() {
+   if [[ ${PV} == * ]] ; then
+   eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch # bug #650876
+

[gentoo-commits] repo/gentoo:master commit in: sys-devel/libtool/, sys-devel/libtool/files/

2022-12-09 Thread Sam James 
commit: 4eeeb5d58d82c6735c001367d0d68ed3767b5ed4
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec 10 02:13:57 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 10 02:13:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eeeb5d5

sys-devel/libtool: drop 2.4.6-r6

Signed-off-by: Sam James  gentoo.org>

 sys-devel/libtool/Manifest |   1 -
 .../libtool/files/libtool-2.4.6-darwin20.patch |  13 --
 .../libtool-2.4.6-libtoolize-delay-help.patch  |  53 -
 .../files/libtool-2.4.6-libtoolize-slow.patch  | 118 --
 .../files/libtool-2.4.6-link-fsanitize.patch   |  46 
 .../libtool/files/libtool-2.4.6-link-fuse-ld.patch |  43 
 .../libtool/files/libtool-2.4.6-link-specs.patch   |  45 
 .../files/libtool-2.4.6-sed-quote-speedup.patch| 253 -
 sys-devel/libtool/libtool-2.4.6-r6.ebuild  | 115 --
 9 files changed, 687 deletions(-)

diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 123e05bfb246..d36ba6c57618 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,2 +1 @@
-DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 
0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356
 SHA512 
a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 
5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2
 SHA512 
47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da

diff --git a/sys-devel/libtool/files/libtool-2.4.6-darwin20.patch 
b/sys-devel/libtool/files/libtool-2.4.6-darwin20.patch
deleted file mode 100644
index 02cb1d7eb9ac..
--- a/sys-devel/libtool/files/libtool-2.4.6-darwin20.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-macOS Big Sur is 11.0, Darwin 20, after a long line of 10.X releases.
-macOS Monterey is 12.0.
 a/m4/libtool.m4
-+++ b/m4/libtool.m4
-@@ -1076,7 +1076,7 @@
- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-   10.[[012]][[,.]]*)
- _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined 
${wl}suppress' ;;
--  10.*)
-+  10.*|11.*|12.*)
- _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
-   esac
- ;;

diff --git a/sys-devel/libtool/files/libtool-2.4.6-libtoolize-delay-help.patch 
b/sys-devel/libtool/files/libtool-2.4.6-libtoolize-delay-help.patch
deleted file mode 100644
index 974cd44d028c..
--- a/sys-devel/libtool/files/libtool-2.4.6-libtoolize-delay-help.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://lists.gnu.org/archive/html/libtool-patches/2016-02/msg2.html
-
-From 53419307d5b44e5b0cff80d76f88ea02f237b747 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger 
-Date: Sat, 13 Feb 2016 03:32:20 -0500
-Subject: [PATCH] libtoolize: don't execute automake and autoconf on every
- invocation.
-
-Same fix as applied to libtool in commit 408cfb9c5fa8a666917167ffb806cb
-to delay use of automake/autoconf to when the --help option is actually
-specified.
-
-* libtoolize.in (func_help): Override func_help() from
-gl/build-aux/options-parser to only run automake --version and
-autoconf --version when libtool --help is executed on the command
-line.

- libtoolize.in | 12 +---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/libtoolize.in b/libtoolize.in
-index 3fe61ce..0d4af3d 100644
 a/libtoolize.in
-+++ b/libtoolize.in
-@@ -94,7 +94,12 @@ usage_message="Options:
- "
- 
- # Additional text appended to 'usage_message' in response to '--help'.
--long_help_message=$long_help_message"
-+func_help ()
-+{
-+$debug_cmd
-+
-+func_usage_message
-+$ECHO "$long_help_message
-'environment'   show warnings about LIBTOOLIZE_OPTIONS content
-'file'  show warnings about file copying and linking
- 
-@@ -120,8 +125,9 @@ include the following information:
- 
- Report bugs to <@PACKAGE_BUGREPORT@>.
- GNU @PACKAGE@ home page: <@PACKAGE_URL@>.
--General help using GNU software: .
--"
-+General help using GNU software: ."
-+exit 0
-+}
- 
- warning_categories='environment file'
- 
--- 
-2.6.2
-

diff --git a/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch 
b/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch
deleted file mode 100644
index d27f976ccb40..
--- a/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 351a88feee66eda6ce33eb06acdebb8e9c6d6716 Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup 
-Date: Fri, 18 Sep 2015 23:17:07 +0200
-Subject: [PATCH] libtoolize: fix infinite recursion in m4
-
-Some projects use this

[gentoo-commits] repo/gentoo:master commit in: sys-devel/libtool/, sys-devel/libtool/files/

2020-12-05 Thread Fabian Groffen 
commit: 058248dc0b88843d3537eeefe1a161b973490907
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Dec  5 13:18:51 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Dec  5 15:18:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=058248dc

sys-devel/libtool-2.4.6: add macOS Big Sur patch

Not rev-bumping because this rarely hits, instead elt-patches is solving
this.

Bug: https://bugs.gentoo.org/758473
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/libtool/files/libtool-2.4.6-darwin20.patch | 13 +
 sys-devel/libtool/libtool-2.4.6-r6.ebuild|  1 +
 2 files changed, 14 insertions(+)

diff --git a/sys-devel/libtool/files/libtool-2.4.6-darwin20.patch 
b/sys-devel/libtool/files/libtool-2.4.6-darwin20.patch
new file mode 100644
index 000..12e87bcbc90
--- /dev/null
+++ b/sys-devel/libtool/files/libtool-2.4.6-darwin20.patch
@@ -0,0 +1,13 @@
+macOS Big Sur is 11.0, Darwin 20, after a long line of 10.X releases.
+
+--- a/m4/libtool.m4
 b/m4/libtool.m4
+@@ -1076,7 +1076,7 @@
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+   10.[[012]][[,.]]*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined 
${wl}suppress' ;;
+-  10.*)
++  10.*|11.*)
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+   esac
+ ;;

diff --git a/sys-devel/libtool/libtool-2.4.6-r6.ebuild 
b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
index aa4b7a76057..7a5cc2bf6dc 100644
--- a/sys-devel/libtool/libtool-2.4.6-r6.ebuild
+++ b/sys-devel/libtool/libtool-2.4.6-r6.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.4.6-mint.patch
"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
+   "${FILESDIR}"/${PN}-2.4.6-darwin20.patch
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: sys-devel/libtool/, sys-devel/libtool/files/

2018-03-26 Thread Lars Wendler 
commit: 5690e822e589b92b4225c8c8b671ff8db5faf605
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Mar 26 08:37:26 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Mar 26 08:38:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5690e822

sys-devel/libtool: Revbump to add pthread patch.

Bug: https://bugs.gentoo.org/650876
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/libtool-2.4.6-libtoolize-slow.patch  |  6 +--
 .../libtool/files/libtool-2.4.6-pthread.patch  | 43 ++
 .../files/libtool-2.4.6-pthread_bootstrapped.patch | 21 +++
 ...libtool-.ebuild => libtool-2.4.6-r5.ebuild} | 16 +++-
 sys-devel/libtool/libtool-.ebuild  |  5 +++
 5 files changed, 87 insertions(+), 4 deletions(-)

diff --git a/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch 
b/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch
index abddee13dc3..d27f976ccb4 100644
--- a/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch
+++ b/sys-devel/libtool/files/libtool-2.4.6-libtoolize-slow.patch
@@ -37,13 +37,13 @@ Signed-off-by: Pavel Raiskup 
  NEWS   |  4 
  NO-THANKS  |  1 +
  bootstrap  | 42 +++---
- gl/build-aux/extract-trace | 42 +++---
+ build-aux/extract-trace| 42 +++---
  4 files changed, 59 insertions(+), 30 deletions(-)
 
 diff --git a/gl/build-aux/extract-trace b/gl/build-aux/extract-trace
 index 315a32a..c6abd21 100755
 a/gl/build-aux/extract-trace
-+++ b/gl/build-aux/extract-trace
+--- a/build-aux/extract-trace
 b/build-aux/extract-trace
 @@ -329,29 +329,41 @@ func_extract_trace ()
  # arguments to Autocof functions, but without following
  # 'm4_s?include' files.

diff --git a/sys-devel/libtool/files/libtool-2.4.6-pthread.patch 
b/sys-devel/libtool/files/libtool-2.4.6-pthread.patch
new file mode 100644
index 000..49b81c1dcda
--- /dev/null
+++ b/sys-devel/libtool/files/libtool-2.4.6-pthread.patch
@@ -0,0 +1,43 @@
+http://permalink.gmane.org/gmane.comp.gnu.libtool.patches/11704
+https://bugs.gentoo.org/650876
+
+From: Pavel Raiskup  redhat.com>
+Subject: [PATCH] libtool: handle the -pthread{,s} options for g++
+Newsgroups: gmane.comp.gnu.libtool.patches
+Date: Thursday 28th November 2013 14:18:05 UTC (over 4 years ago)
+
+As we are forced to pass -nostdlib to g++ for linking, this option
+expectedly disables the effectiveness of passed -pthread flag - so
+add the -lpthread explicitly to $deplibs to link correctly.
+
+References:
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=25460
+https://bugzilla.redhat.com/show_bug.cgi?id=661333
+http://lists.gnu.org/archive/html/bug-libtool/2013-01/msg00018.htm
+
+* build-aux/ltmain.in (func_mode_link): Explicitly add -lpthread
+flag into $deplibs when -pthread is passed (for g++ only).
+---
+ build-aux/ltmain.in | 10 ++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
+index fba05c1..f202b80 100644
+--- a/build-aux/ltmain.in
 b/build-aux/ltmain.in
+@@ -5113,6 +5113,16 @@ func_mode_link ()
+   *" $arg "*) ;;
+   * ) func_append new_inherited_linker_flags " $arg" ;;
+   esac
++
++  # As we are forced to pass -nostdlib to g++ during linking, the option
++  # -pthread{,s} is not in effect;  add the -lpthread to $deplist
++  # explicitly to link correctly.
++  if test "$tagname" = CXX -a x"$with_gcc" = xyes; then
++case "$arg" in
++  -pthread*) func_append deplibs " -lpthread" ;;
++esac
++  fi
++
+   continue
+   ;;

diff --git a/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch 
b/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch
new file mode 100644
index 000..54461ccc54e
--- /dev/null
+++ b/sys-devel/libtool/files/libtool-2.4.6-pthread_bootstrapped.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/650876
+
+--- libtool-2.4.6/build-aux/ltmain.sh
 libtool-2.4.6/build-aux/ltmain.sh
+@@ -7079,6 +7079,16 @@
+   *" $arg "*) ;;
+   * ) func_append new_inherited_linker_flags " $arg" ;;
+   esac
++
++  # As we are forced to pass -nostdlib to g++ during linking, the option
++  # -pthread{,s} is not in effect;  add the -lpthread to $deplist
++  # explicitly to link correctly.
++  if test "$tagname" = CXX -a x"$with_gcc" = xyes; then
++case "$arg" in
++  -pthread*) func_append deplibs " -lpthread" ;;
++esac
++  fi
++
+   continue
+   ;;
+ 

diff --git a/sys-devel/libtool/libtool-.ebuild 
b/sys-devel/libtool/libtool-2.4.6-r5.ebuild
similarity index 86%
copy from sys-devel/libtool/libtool-.ebuild
copy to sys-devel/libtool/libtool-2.4.6-r5.ebuild
index db8bd168cfd..710968a99a5 100644
---

[gentoo-commits] repo/gentoo:master commit in: sys-devel/libtool/, sys-devel/libtool/files/

2017-02-21 Thread Mike Frysinger 
commit: 80ed801a322763a07fa50b04726a1fefb7ee2356
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Feb 21 22:42:31 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Feb 21 22:45:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ed801a

sys-devel/libtool: fix target linkage for ppc64le systems #581314

 .../libtool/files/libtool-2.4.6-ppc64le.patch  | 111 +
 sys-devel/libtool/libtool-2.4.6-r3.ebuild  |  93 +
 2 files changed, 204 insertions(+)

diff --git a/sys-devel/libtool/files/libtool-2.4.6-ppc64le.patch 
b/sys-devel/libtool/files/libtool-2.4.6-ppc64le.patch
new file mode 100644
index 00..78d86c7295
--- /dev/null
+++ b/sys-devel/libtool/files/libtool-2.4.6-ppc64le.patch
@@ -0,0 +1,111 @@
+From 020afd7d6410f73bc205206abe1b88b4890b83b1 Mon Sep 17 00:00:00 2001
+From: Leno Hou 
+Date: Sun, 24 Apr 2016 00:46:53 +0800
+Subject: [PATCH] [m4/libtool.m4] linker error for powerpc64le-unknown-linux-gnu
+
+Hi all,
+
+ 1) As we might know, Gentoo has powerpc64le-unknown-linux-gnu compiler
+
+leno@localhost ~ $ powerpc64le-unknown-linux-gnu-gcc -v
+
+Using built-in specs.
+
+COLLECT_GCC=/usr/powerpc64le-unknown-linux-gnu/gcc-bin/5.3.0/powerpc64le-unknown-linux-gnu-gcc
+
+COLLECT_LTO_WRAPPER=/usr/libexec/gcc/powerpc64le-unknown-linux-gnu/5.3.0/lto-wrapper
+
+Target: powerpc64le-unknown-linux-gnu
+
+Configured with:
+/var/tmp/portage/sys-devel/gcc-5.3.0/work/gcc-5.3.0/configure
+--host=powerpc64le-unknown-linux-gnu --build=powerpc64le-unknown-linux-gnu
+--prefix=/usr --bindir=/usr/powerpc64le-unknown-linux-gnu/gcc-bin/5.3.0
+--includedir=/usr/lib/gcc/powerpc64le-unknown-linux-gnu/5.3.0/include
+--datadir=/usr/share/gcc-data/powerpc64le-unknown-linux-gnu/5.3.0
+--mandir=/usr/share/gcc-data/powerpc64le-unknown-linux-gnu/5.3.0/man
+--infodir=/usr/share/gcc-data/powerpc64le-unknown-linux-gnu/5.3.0/info
+--with-gxx-include-dir=/usr/lib/gcc/powerpc64le-unknown-linux-gnu/5.3.0/include/g++-v5
+--with-python-dir=/share/gcc-data/powerpc64le-unknown-linux-gnu/5.3.0/python
+--enable-languages=c,c++,fortran --enable-obsolete --enable-secureplt
+--disable-werror --with-system-zlib --enable-nls --without-included-gettext
+--enable-checking=release --with-bugurl=https://bugs.gentoo.org/
+--with-pkgversion='Gentoo 5.3.0 p1.0, pie-0.6.5' --enable-libstdcxx-time
+--enable-shared --enable-threads=posix --enable-__cxa_atexit
+--enable-clocale=gnu --disable-multilib --enable-altivec
+--disable-fixed-point --enable-targets=all --disable-libgcj
+--enable-libgomp --disable-libmudflap --disable-libssp --disable-libcilkrts
+--enable-lto --without-isl --enable-libsanitizer
+
+Thread model: posix
+
+gcc version 5.3.0 (Gentoo 5.3.0 p1.0, pie-0.6.5)
+
+  2) And the supported emulations
+
+leno@localhost ~ $ powerpc64le-unknown-linux-gnu-ld -V
+GNU ld (Gentoo 2.25.1 p1.1) 2.25.1
+  Supported emulations:
+   elf64lppc
+   elf32lppc
+   elf32lppclinux
+   elf32lppcsim
+
+   3) But when I set CHOST="powerpc64le-unkown-linux-gnu" in Gentoo and
+execute aclocal, automake, libtoolize --copy --force, autoconf. When I
+glance in the latest m4/libtool.m4 :
+
+if AC_TRY_EVAL(ac_compile); then
+   case `/usr/bin/file conftest.o` in
+ *32-bit*)
+   case $host in
+...
+ powerpc64le-*linux*)
+   LD="${LD-ld} -m elf32lppclinux"
+   ;;
+ powerpc64-*linux*)
+   LD="${LD-ld} -m elf32ppclinux"
+   ;;
+...
+ *64-bit*)
+   case $host in
+...
+ powerpcle-*linux*)
+   LD="${LD-ld} -m elf64lppc"
+   ;;
+ powerpc-*linux*)
+   LD="${LD-ld} -m elf64ppc"
+   ;;
+...
+
+seems linked to $LD='$LD-ld -m elf64ppc' and failed to compile packages.
+
+ 4)  Below is my workaround patch and works fine for this case.  If this is
+OK for you, Could this to be merged in upstream? Thanks
+
+URL: https://debbugs.gnu.org/23348
+URL: https://bugs.gentoo.org/581314
+---
+ m4/libtool.m4 | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/m4/libtool.m4 b/m4/libtool.m4
+index ee292aff5bca..758b6951ae07 100644
+--- a/m4/libtool.m4
 b/m4/libtool.m4
+@@ -1417,10 +1417,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+ x86_64-*linux*)
+   LD="${LD-ld} -m elf_x86_64"
+   ;;
+-powerpcle-*linux*)
++powerpcle-*linux*|powerpc64le-*linux*)
+   LD="${LD-ld} -m elf64lppc"
+   ;;
+-powerpc-*linux*)
++powerpc-*linux*|powerpc64-*linux*)
+   LD="${LD-ld} -m elf64ppc"
+   ;;
+ s390*-*linux*|s390*-*tpf*)
+-- 
+2.11.1
+

diff --git a/sys-devel/libtool/libtool-2.4.6-r3.ebuild 
b/sys-devel/libtool/libtool-2.4.6-r3.ebuild
new file mode 100644
index 00..9ac2aa6435
--- /dev/null
+++ b/sys-devel/libtool/libtool-2.4.6-r3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2

[gentoo-commits] repo/gentoo:master commit in: sys-devel/libtool/, sys-devel/libtool/files/1.5.20/

2016-12-09 Thread Lars Wendler 
commit: e5719bec93136e71cc64b6357d24f1199df33a8e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Dec  9 13:52:27 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Dec  9 13:53:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5719bec

sys-devel/libtool: Removed old.

Package-Manager: portage-2.3.3

 sys-devel/libtool/Manifest |  3 -
 .../libtool-1.5.20-use-linux-version-in-fbsd.patch | 38 -
 sys-devel/libtool/libtool-2.4.2-r1.ebuild  | 96 --
 sys-devel/libtool/libtool-2.4.4.ebuild | 77 -
 sys-devel/libtool/libtool-2.4.5.ebuild | 77 -
 sys-devel/libtool/libtool-2.4.6-r1.ebuild  | 84 ---
 6 files changed, 375 deletions(-)

diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index ba9189f..5c4e7a0 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -1,4 +1 @@
-DIST libtool-2.4.2.tar.xz 868760 SHA256 
1d7b6862c1ed162e327f083a6f78f40eae29218f0db8c38393d61dab764c4407 SHA512 
34f2d4a32beb4d85cfefd9c2c4ff33b0117e9e89c6599c303a7b850c43be5ed090b2f530388b8c8154e8f3f693abd2079180dca9afc948feb800b2e009bed169
 WHIRLPOOL 
300697c30b6cf693463338ee3bfe10b9ccce2c496b319862182124828caf7b667a7e9cf21f287572ec1fed8abe529a14d171da2983369522faf3eed5513a1af5
-DIST libtool-2.4.4.tar.xz 957476 SHA256 
a8295b5853bf82a46635c944031e84970f2aa79c19df7a0c28f3ec8e11c07f6c SHA512 
1ff24aa88962e0aae82e1fff41df7863f925627a506c6a663a79afa23729272aa4e5816889dd4697d5286d42483bcee2cc7352514768f1bd28ea546476074a84
 WHIRLPOOL 
def0381a3608b52f8f5e9b83d297643d48d3e695117199b10b4ae3d6f5b11f3d3a36c4b6572b7659061c3fee77e46da4f5e3cfffa594063fed0fe382869c3539
-DIST libtool-2.4.5.tar.xz 971620 SHA256 
84aac136513b009278896ffa255e4d685bcdb0cb0e5363be36adad64c986177e SHA512 
67ceb387e33fbf0ffe6df422cd26939e305a365bb22674ce064ed7f7d6602054682515b014e290c70587b7f9b6f85f00fac31d6f000b4b022daaa2b343c17327
 WHIRLPOOL 
4a5171a8f23d50b78eb70bbd2ff9497fe2a970933392c65c41ab44600838cdc744e4e9ddfef37ac009cf5784de8c7b1ef061f8156919b7417e78529978afe7ed
 DIST libtool-2.4.6.tar.xz 973080 SHA256 
7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f SHA512 
a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
 WHIRLPOOL 
f6e1ea25cc8dd853f0de53c045bcd1166cfede9cb0e890079c2c05e6cbdb5e705e137f83ba32f7e16691b9c9108e9cfb2d14ed030cea07b6eacbe3f1ae18a73b

diff --git 
a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch 
b/sys-devel/libtool/files/1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch
deleted file mode 100644
index cc9d8b8..
--- 
a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-use-linux-version-in-fbsd.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Force linux-style versioning when generating shared libraries on 
-Gentoo/FreeBSD hosts only.
-
-Patch by Diego Petten�
-
-http://bugs.gentoo.org/109105
-
 libtool-1.5.20/libtool.m4
-+++ libtool-1.5.20/libtool.m4
-@@ -1375,7 +1375,14 @@ freebsd* | dragonfly*)
- *) objformat=elf ;;
- esac
-   fi
--  version_type=freebsd-$objformat
-+  # Handle Gentoo/FreeBSD as it was Linux
-+  case $host_vendor in
-+gentoo)
-+  version_type=linux ;;
-+*)
-+  version_type=freebsd-$objformat ;;
-+  esac
-+
-   case $version_type in
- freebsd-elf*)
-   library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext} $libname${shared_ext}'
-@@ -1386,6 +1392,12 @@ freebsd* | dragonfly*)
-   library_names_spec='${libname}${release}${shared_ext}$versuffix 
$libname${shared_ext}$versuffix'
-   need_version=yes
-   ;;
-+linux)
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix 
${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  need_lib_prefix=no
-+  need_version=no
-+  ;;
-   esac
-   shlibpath_var=LD_LIBRARY_PATH
-   case $host_os in

diff --git a/sys-devel/libtool/libtool-2.4.2-r1.ebuild 
b/sys-devel/libtool/libtool-2.4.2-r1.ebuild
deleted file mode 100644
index 7aa4d88..
--- a/sys-devel/libtool/libtool-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-LIBTOOLIZE="true" #225559
-WANT_LIBTOOL="none"
-inherit eutils autotools multilib unpacker multilib-minimal
-
-if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
-   http://git.savannah.gnu.org/r/${PN}.git;
-   inherit git-2
-else
-   SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-   KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 
sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-DESCRIPTION="A shared library tool for developers"

[gentoo-commits] repo/gentoo:master commit in: sys-devel/libtool/, sys-devel/libtool/files/

2015-09-11 Thread Mike Frysinger 
commit: 840e66d340d39348cf401d8079138b7ed5676354
Author: Mike Frysinger  gentoo  org>
AuthorDate: Fri Sep 11 17:26:51 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Fri Sep 11 18:10:54 2015 +
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-.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} != "" ]] ; then
+   touch doc/*.1
+   export HELP2MAN=false
+   fi
 }
 
 src_configure() {

diff --git a/sys-devel/libtool/libtool-.ebuild 
b/sys-devel/libtool/libtool-.ebuild
index 923f8b4..8b6ede5 100644
--- a/sys-devel/libtool/libtool-.ebuild
+++ b/sys-devel/libtool/libtool-.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} != "" ]] ; then
+   touch doc/*.1
+   export HELP2MAN=false
+   fi
 }
 
 src_configure() {