mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-14 16:37:01 +02:00
sys-devel/libtool: Sync with Gentoo
It's from Gentoo commit cfb6be2cca843dbf53924056bf74d626a2660e85.
This commit is contained in:
parent
3ecb5bf74a
commit
b467dc7d6b
@ -0,0 +1,31 @@
|
|||||||
|
https://bugs.gentoo.org/892635
|
||||||
|
https://lists.gnu.org/archive/html/libtool-patches/2022-12/msg00004.html
|
||||||
|
|
||||||
|
From 414deacee0f564afdf2d7750450274c581330a59 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20B=C3=A9rat?= <fberat@redhat.com>
|
||||||
|
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
|
@ -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
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
|
|||||||
inherit git-r3
|
inherit git-r3
|
||||||
else
|
else
|
||||||
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
|
SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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"
|
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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
|
fi
|
||||||
|
|
||||||
DESCRIPTION="A shared library tool for developers"
|
DESCRIPTION="A shared library tool for developers"
|
||||||
@ -30,7 +30,8 @@ RDEPEND="
|
|||||||
sys-devel/gnuconfig
|
sys-devel/gnuconfig
|
||||||
>=sys-devel/autoconf-2.69:*
|
>=sys-devel/autoconf-2.69:*
|
||||||
>=sys-devel/automake-1.13:*
|
>=sys-devel/automake-1.13:*
|
||||||
>=dev-libs/libltdl-2.4.7"
|
>=dev-libs/libltdl-2.4.7
|
||||||
|
"
|
||||||
DEPEND="${RDEPEND}"
|
DEPEND="${RDEPEND}"
|
||||||
[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
|
[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
|
||||||
|
|
||||||
@ -44,6 +45,7 @@ PATCHES=(
|
|||||||
"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.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-darwin-use-linux-version.patch
|
||||||
"${FILESDIR}"/${PN}-2.4.7-werror-lto.patch
|
"${FILESDIR}"/${PN}-2.4.7-werror-lto.patch
|
||||||
|
"${FILESDIR}"/${PN}-2.4.7-grep-3.8.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
src_prepare() {
|
src_prepare() {
|
||||||
|
@ -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
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
EAPI=7
|
EAPI=7
|
||||||
@ -30,7 +30,8 @@ RDEPEND="
|
|||||||
sys-devel/gnuconfig
|
sys-devel/gnuconfig
|
||||||
>=sys-devel/autoconf-2.69:*
|
>=sys-devel/autoconf-2.69:*
|
||||||
>=sys-devel/automake-1.13:*
|
>=sys-devel/automake-1.13:*
|
||||||
>=dev-libs/libltdl-2.4.7"
|
>=dev-libs/libltdl-2.4.7
|
||||||
|
"
|
||||||
DEPEND="${RDEPEND}"
|
DEPEND="${RDEPEND}"
|
||||||
[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
|
[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
|
||||||
|
|
||||||
@ -43,6 +44,7 @@ PATCHES=(
|
|||||||
"${FILESDIR}"/${PN}-2.4.6-mint.patch
|
"${FILESDIR}"/${PN}-2.4.6-mint.patch
|
||||||
"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.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-darwin-use-linux-version.patch
|
||||||
|
"${FILESDIR}"/${PN}-2.4.7-grep-3.8.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
src_prepare() {
|
src_prepare() {
|
||||||
|
Loading…
Reference in New Issue
Block a user