mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-15 08:56:58 +02:00
sys-devel/libtool: Sync with gentoo
It's from gentoo commit 529604d0f0535af177d87e698390ec7dab0cbfe1.
This commit is contained in:
Krzesimir Nowak
parent
5eb1b2dc78
commit
bc9de4612e
@ -11,10 +11,10 @@ in this context refers to the binary itself, not to a structured
|
||||
hierarchy. Bundles have the .bundle extension; for example,
|
||||
MyBundle.bundle.)
|
||||
|
||||
--- libltdl/m4/libtool.m4
|
||||
+++ libltdl/m4/libtool.m4
|
||||
@@ -2271,7 +2271,7 @@
|
||||
soname_spec='${libname}${release}${major}$shared_ext'
|
||||
--- a/m4/libtool.m4
|
||||
+++ b/m4/libtool.m4
|
||||
@@ -2645,7 +2645,7 @@
|
||||
soname_spec='$libname$release$major$shared_ext'
|
||||
shlibpath_overrides_runpath=yes
|
||||
shlibpath_var=DYLD_LIBRARY_PATH
|
||||
- shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
|
||||
|
||||
@ -7,7 +7,7 @@ http://bugs.gentoo.org/109105
|
||||
|
||||
--- a/m4/libtool.m4
|
||||
+++ b/m4/libtool.m4
|
||||
@@ -1375,7 +1375,14 @@
|
||||
@@ -2666,7 +2666,14 @@
|
||||
*) objformat=elf ;;
|
||||
esac
|
||||
fi
|
||||
@ -22,9 +22,9 @@ http://bugs.gentoo.org/109105
|
||||
+
|
||||
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 @@
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
|
||||
library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
||||
@@ -2678,6 +2685,12 @@
|
||||
library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
|
||||
need_version=yes
|
||||
;;
|
||||
+ linux)
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
* revert old 1.5 behaviour
|
||||
|
||||
--- libtool-2.4.6/m4/libtool.m4
|
||||
+++ libtool-2.4.6/m4/libtool.m4
|
||||
@@ -2272,7 +2272,7 @@
|
||||
--- a/m4/libtool.m4
|
||||
+++ b/m4/libtool.m4
|
||||
@@ -2641,7 +2641,7 @@
|
||||
version_type=darwin
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
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
|
||||
;;
|
||||
@ -13,15 +13,10 @@ linker to allow trivial use of the clang address sanitizer.
|
||||
|
||||
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
|
||||
Copyright-paperwork-exempt: Yes
|
||||
---
|
||||
build-aux/ltmain.in | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
||||
index 1cbe875..2a5aaad 100644
|
||||
--- a/build-aux/ltmain.in
|
||||
+++ b/build-aux/ltmain.in
|
||||
@@ -5382,10 +5382,11 @@ func_mode_link ()
|
||||
@@ -5362,10 +5362,11 @@
|
||||
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
|
||||
# -specs=* GCC specs files
|
||||
# -stdlib=* select c++ std lib with clang
|
||||
@ -34,13 +29,9 @@ index 1cbe875..2a5aaad 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
|
||||
@@ -5382,10 +5382,11 @@ func_mode_link ()
|
||||
@@ -7274,10 +7274,11 @@
|
||||
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
|
||||
# -specs=* GCC specs files
|
||||
# -stdlib=* select c++ std lib with clang
|
||||
@ -53,6 +44,3 @@ https://bugs.gentoo.org/556512
|
||||
func_quote_for_eval "$arg"
|
||||
arg=$func_quote_for_eval_result
|
||||
func_append compile_command " $arg"
|
||||
--
|
||||
2.6.2
|
||||
|
||||
|
||||
@ -10,15 +10,10 @@ Starting with gcc-4.8, there's a -fuse-ld flag that can be used to select
|
||||
between bfd & gold. Make sure we pass it through to the linking stage.
|
||||
|
||||
* build-aux/ltmain.in (func_mode_link): Pass -fuse-ld=* flags through.
|
||||
---
|
||||
build-aux/ltmain.in | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
||||
index 2a5aaad..4c24d5d 100644
|
||||
--- a/build-aux/ltmain.in
|
||||
+++ b/build-aux/ltmain.in
|
||||
@@ -5383,10 +5383,11 @@ func_mode_link ()
|
||||
@@ -5363,10 +5363,11 @@
|
||||
# -specs=* GCC specs files
|
||||
# -stdlib=* select c++ std lib with clang
|
||||
# -fsanitize=* Clang/GCC memory and address sanitizer
|
||||
@ -31,13 +26,9 @@ index 2a5aaad..4c24d5d 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
|
||||
@@ -5383,10 +5383,11 @@ func_mode_link ()
|
||||
@@ -7275,10 +7275,11 @@
|
||||
# -specs=* GCC specs files
|
||||
# -stdlib=* select c++ std lib with clang
|
||||
# -fsanitize=* Clang/GCC memory and address sanitizer
|
||||
@ -50,5 +41,3 @@ https://bugs.gentoo.org/556512
|
||||
func_quote_for_eval "$arg"
|
||||
arg=$func_quote_for_eval_result
|
||||
func_append compile_command " $arg"
|
||||
--
|
||||
2.3.2
|
||||
|
||||
@ -10,15 +10,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=985592
|
||||
to the linker, Fedora uses this option for hardening.
|
||||
|
||||
Signed-off-by: Pavel Raiskup <praiskup@redhat.com>
|
||||
---
|
||||
build-aux/ltmain.in | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
||||
index d5cf07a..0c40da0 100644
|
||||
--- a/build-aux/ltmain.in
|
||||
+++ b/build-aux/ltmain.in
|
||||
@@ -5360,10 +5360,12 @@ func_mode_link ()
|
||||
@@ -5360,10 +5360,12 @@
|
||||
# -tp=* Portland pgcc target processor selection
|
||||
# --sysroot=* for sysroot support
|
||||
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
|
||||
@ -32,13 +27,9 @@ index d5cf07a..0c40da0 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 ()
|
||||
@@ -7272,10 +7272,12 @@
|
||||
# -tp=* Portland pgcc target processor selection
|
||||
# --sysroot=* for sysroot support
|
||||
# -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
|
||||
@ -52,6 +43,3 @@ https://bugs.gentoo.org/556512
|
||||
func_quote_for_eval "$arg"
|
||||
arg=$func_quote_for_eval_result
|
||||
func_append compile_command " $arg"
|
||||
--
|
||||
2.6.2
|
||||
|
||||
|
||||
@ -2,10 +2,9 @@ Patch by Alan Hourihane
|
||||
|
||||
http://bugs.gentoo.org/show_bug.cgi?id=266984
|
||||
|
||||
diff -ur libtool-2.2.6/configure libtool-2.2.6-mint/configure
|
||||
--- libtool-2.2.6/configure 2008-09-07 17:52:50.000000000 +0000
|
||||
+++ libtool-2.2.6/configure 2009-04-21 08:49:27.000000000 +0000
|
||||
@@ -4986,6 +4986,11 @@
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -5897,6 +5897,11 @@
|
||||
lt_cv_sys_max_cmd_len=8192;
|
||||
;;
|
||||
|
||||
@ -17,10 +16,9 @@ diff -ur libtool-2.2.6/configure libtool-2.2.6-mint/configure
|
||||
amigaos*)
|
||||
# On AmigaOS with pdksh, this test takes hours, literally.
|
||||
# So we just punt and use a minimum line length of 8192.
|
||||
diff -ur libtool-2.2.6/libltdl/configure libtool-2.2.6-mint/libltdl/configure
|
||||
--- libtool-2.2.6/libltdl/configure 2008-09-07 17:53:05.000000000 +0000
|
||||
+++ libtool-2.2.6/libltdl/configure 2009-04-21 08:50:08.000000000 +0000
|
||||
@@ -4422,6 +4422,11 @@
|
||||
--- a/libltdl/configure
|
||||
+++ b/libltdl/configure
|
||||
@@ -4782,6 +4782,11 @@
|
||||
lt_cv_sys_max_cmd_len=8192;
|
||||
;;
|
||||
|
||||
@ -32,10 +30,9 @@ diff -ur libtool-2.2.6/libltdl/configure libtool-2.2.6-mint/libltdl/configure
|
||||
amigaos*)
|
||||
# On AmigaOS with pdksh, this test takes hours, literally.
|
||||
# So we just punt and use a minimum line length of 8192.
|
||||
diff -ur libtool-2.2.6/libltdl/m4/libtool.m4 libtool-2.2.6-mint/libltdl/m4/libtool.m4
|
||||
--- libtool-2.2.6/m4/libtool.m4 2008-09-05 11:54:41.000000000 +0000
|
||||
+++ libtool-2.2.6/m4/libtool.m4 2009-04-21 08:50:26.000000000 +0000
|
||||
@@ -1527,6 +1527,11 @@
|
||||
--- a/m4/libtool.m4
|
||||
+++ b/m4/libtool.m4
|
||||
@@ -1708,6 +1708,11 @@
|
||||
lt_cv_sys_max_cmd_len=8192;
|
||||
;;
|
||||
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
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 @@
|
||||
--- a/build-aux/ltmain.sh
|
||||
+++ b/build-aux/ltmain.sh
|
||||
@@ -7127,6 +7127,16 @@
|
||||
*" $arg "*) ;;
|
||||
* ) func_append new_inherited_linker_flags " $arg" ;;
|
||||
esac
|
||||
|
||||
@ -20,18 +20,10 @@ of '$SED $sed_quote_subst'.
|
||||
(func_mode_link): Likewise.
|
||||
* NEWS: Document.
|
||||
* bootstrap: Sync with funclib.sh.
|
||||
---
|
||||
NEWS | 3 +++
|
||||
bootstrap | 61 +++++++++++++++++++++++++++++++++++++++++++------
|
||||
build-aux/ltmain.in | 10 ++++----
|
||||
gl/build-aux/funclib.sh | 61 +++++++++++++++++++++++++++++++++++++++++++------
|
||||
4 files changed, 117 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
|
||||
index 0c40da0..24acefd 100644
|
||||
--- a/build-aux/ltmain.in
|
||||
+++ b/build-aux/ltmain.in
|
||||
@@ -3346,7 +3346,8 @@ else
|
||||
@@ -3346,7 +3346,8 @@
|
||||
if test \"\$libtool_execute_magic\" != \"$magic\"; then
|
||||
file=\"\$0\""
|
||||
|
||||
@ -41,7 +33,7 @@ index 0c40da0..24acefd 100644
|
||||
$ECHO "\
|
||||
|
||||
# A function that is used when there is no print builtin or printf.
|
||||
@@ -8596,8 +8597,8 @@ EOF
|
||||
@@ -8598,8 +8599,8 @@
|
||||
relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
|
||||
fi
|
||||
done
|
||||
@ -52,7 +44,7 @@ index 0c40da0..24acefd 100644
|
||||
fi
|
||||
|
||||
# Only actually do things if not in dry run mode.
|
||||
@@ -8843,7 +8844,8 @@ EOF
|
||||
@@ -8845,7 +8846,8 @@
|
||||
done
|
||||
# Quote the link command for shipping.
|
||||
relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
|
||||
@ -62,8 +54,6 @@ index 0c40da0..24acefd 100644
|
||||
if test yes = "$hardcode_automatic"; then
|
||||
relink_command=
|
||||
fi
|
||||
diff --git a/gl/build-aux/funclib.sh b/gl/build-aux/funclib.sh
|
||||
index 39d972e..47d8b95 100644
|
||||
--- a/build-aux/funclib.sh
|
||||
+++ b/build-aux/funclib.sh
|
||||
@@ -1,5 +1,5 @@
|
||||
@ -73,7 +63,7 @@ index 39d972e..47d8b95 100644
|
||||
|
||||
# General shell script boiler plate, and helper functions.
|
||||
# Written by Gary V. Vaughan, 2004
|
||||
@@ -1026,6 +1026,57 @@ func_relative_path ()
|
||||
@@ -1026,6 +1026,57 @@
|
||||
}
|
||||
|
||||
|
||||
@ -131,7 +121,7 @@ index 39d972e..47d8b95 100644
|
||||
# func_quote_for_eval ARG...
|
||||
# --------------------------
|
||||
# Aesthetically quote ARGs to be evaled later.
|
||||
@@ -1042,12 +1093,8 @@ func_quote_for_eval ()
|
||||
@@ -1042,12 +1093,8 @@
|
||||
func_quote_for_eval_unquoted_result=
|
||||
func_quote_for_eval_result=
|
||||
while test 0 -lt $#; do
|
||||
@ -146,20 +136,18 @@ index 39d972e..47d8b95 100644
|
||||
if test -n "$func_quote_for_eval_unquoted_result"; then
|
||||
func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
|
||||
else
|
||||
|
||||
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
|
||||
@@ -1,5 +1,5 @@
|
||||
@@ -64,7 +64,7 @@
|
||||
# libraries, which are installed to $pkgauxdir.
|
||||
|
||||
# Set a version string for this script.
|
||||
-scriptversion=2015-01-20.17; # UTC
|
||||
+scriptversion=2015-10-04.22; # UTC
|
||||
|
||||
# General shell script boiler plate, and helper functions.
|
||||
# Written by Gary V. Vaughan, 2004
|
||||
@@ -1026,6 +1026,57 @@ func_relative_path ()
|
||||
@@ -1091,6 +1091,57 @@
|
||||
}
|
||||
|
||||
|
||||
@ -217,7 +205,7 @@ https://bugs.gentoo.org/556512
|
||||
# func_quote_for_eval ARG...
|
||||
# --------------------------
|
||||
# Aesthetically quote ARGs to be evaled later.
|
||||
@@ -1042,12 +1093,8 @@ func_quote_for_eval ()
|
||||
@@ -1107,12 +1158,8 @@
|
||||
func_quote_for_eval_unquoted_result=
|
||||
func_quote_for_eval_result=
|
||||
while test 0 -lt $#; do
|
||||
@ -232,7 +220,7 @@ https://bugs.gentoo.org/556512
|
||||
if test -n "$func_quote_for_eval_unquoted_result"; then
|
||||
func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
|
||||
else
|
||||
@@ -3346,7 +3346,8 @@ else
|
||||
@@ -5258,7 +5305,8 @@
|
||||
if test \"\$libtool_execute_magic\" != \"$magic\"; then
|
||||
file=\"\$0\""
|
||||
|
||||
@ -242,7 +230,7 @@ https://bugs.gentoo.org/556512
|
||||
$ECHO "\
|
||||
|
||||
# A function that is used when there is no print builtin or printf.
|
||||
@@ -8596,8 +8597,8 @@ EOF
|
||||
@@ -10510,8 +10558,8 @@
|
||||
relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
|
||||
fi
|
||||
done
|
||||
@ -253,7 +241,7 @@ https://bugs.gentoo.org/556512
|
||||
fi
|
||||
|
||||
# Only actually do things if not in dry run mode.
|
||||
@@ -8843,7 +8844,8 @@ EOF
|
||||
@@ -10757,7 +10805,8 @@
|
||||
done
|
||||
# Quote the link command for shipping.
|
||||
relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
|
||||
@ -263,6 +251,3 @@ https://bugs.gentoo.org/556512
|
||||
if test yes = "$hardcode_automatic"; then
|
||||
relink_command=
|
||||
fi
|
||||
--
|
||||
2.6.2
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EAPI=7
|
||||
|
||||
LIBTOOLIZE="true" #225559
|
||||
WANT_LIBTOOL="none"
|
||||
@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
|
||||
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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
|
||||
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"
|
||||
@ -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() {
|
||||
|
||||
@ -1,19 +1,18 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EAPI=7
|
||||
|
||||
LIBTOOLIZE="true" #225559
|
||||
WANT_LIBTOOL="none"
|
||||
inherit autotools epunt-cxx multilib unpacker prefix
|
||||
inherit autotools prefix
|
||||
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
|
||||
http://git.savannah.gnu.org/r/${PN}.git"
|
||||
if [[ ${PV} == *9999 ]] ; 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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
|
||||
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"
|
||||
@ -24,14 +23,13 @@ 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:0
|
||||
!<sys-apps/sandbox-2.10-r4"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/xz-utils"
|
||||
[[ ${PV} == "9999" ]] && DEPEND+=" sys-apps/help2man"
|
||||
RDEPEND="
|
||||
sys-devel/gnuconfig
|
||||
>=sys-devel/autoconf-2.69:*
|
||||
>=sys-devel/automake-1.13:*
|
||||
dev-libs/libltdl:0"
|
||||
DEPEND="${RDEPEND}"
|
||||
[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch #109105
|
||||
@ -40,27 +38,25 @@ PATCHES=(
|
||||
"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
if [[ ${PV} == "9999" ]] ; then
|
||||
git-r3_src_unpack
|
||||
else
|
||||
unpacker_src_unpack
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if [[ "${PV}" = 9999 ]] ; then
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch #650876
|
||||
./bootstrap || die
|
||||
else
|
||||
PATCHES+=(
|
||||
"${FILESDIR}"/${P}-pthread_bootstrapped.patch #650876
|
||||
"${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch #650876
|
||||
)
|
||||
fi
|
||||
|
||||
use vanilla && return 0
|
||||
# WARNING: File build-aux/ltmain.sh is read-only; trying to patch anyway
|
||||
chmod +w build-aux/ltmain.sh || die
|
||||
|
||||
default
|
||||
if use vanilla ; then
|
||||
eapply_user
|
||||
return 0
|
||||
else
|
||||
default
|
||||
fi
|
||||
|
||||
if use prefix ; then
|
||||
# seems that libtool has to know about EPREFIX a little bit
|
||||
@ -73,15 +69,15 @@ src_prepare() {
|
||||
eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch
|
||||
eprefixify m4/libtool.m4
|
||||
fi
|
||||
pushd libltdl >/dev/null
|
||||
|
||||
pushd libltdl >/dev/null || die
|
||||
AT_NOELIBTOOLIZE=yes eautoreconf
|
||||
popd >/dev/null
|
||||
popd >/dev/null || die
|
||||
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
|
||||
if [[ ${PV} != *9999 ]] ; then
|
||||
touch doc/*.1 || die
|
||||
export HELP2MAN=false
|
||||
fi
|
||||
}
|
||||
@ -96,15 +92,10 @@ src_configure() {
|
||||
# Do not bother hardcoding the full path to sed. Just rely on $PATH. #574550
|
||||
export ac_cv_path_SED="$(basename "$(type -P sed)")"
|
||||
|
||||
local myconf
|
||||
[[ ${CHOST} == *-darwin* ]] && myconf="--program-prefix=g"
|
||||
[[ ${CHOST} == *-darwin* ]] && local myconf="--program-prefix=g"
|
||||
ECONF_SOURCE=${S} econf ${myconf} --disable-ltdl-install
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
|
||||
@ -1,8 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>base-system@gentoo.org</email>
|
||||
<name>Gentoo Base System</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:gnu:libtool</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user