* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2007-09-14 6:49 Roy Marples (uberlord)
0 siblings, 0 replies; 24+ messages in thread
From: Roy Marples (uberlord) @ 2007-09-14 6:49 UTC (permalink / raw
To: gentoo-commits
uberlord 07/09/14 06:49:46
Modified: libtool.eclass
Log:
Add a patch for ltmain.sh-1.5 so that KDE ebuilds link correctly on FreeBSD, #182214
Revision Changes Path
1.77 eclass/libtool.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.77&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.77&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?r1=1.76&r2=1.77
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- libtool.eclass 30 May 2007 15:45:34 -0000 1.76
+++ libtool.eclass 14 Sep 2007 06:49:45 -0000 1.77
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.76 2007/05/30 15:45:34 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.77 2007/09/14 06:49:45 uberlord Exp $
#
# Maintainer: base-system@gentoo.org
#
@@ -122,7 +122,7 @@
local do_uclibc="yes"
local deptoremove=
local my_dirlist=
- local elt_patches="portage relink max_cmd_len sed test tmp"
+ local elt_patches="ltmain portage relink max_cmd_len sed test tmp"
local start_dir=${PWD}
my_dirlist=$(ELT_find_ltmain_sh)
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2007-09-14 11:38 Roy Marples (uberlord)
0 siblings, 0 replies; 24+ messages in thread
From: Roy Marples (uberlord) @ 2007-09-14 11:38 UTC (permalink / raw
To: gentoo-commits
uberlord 07/09/14 11:38:01
Modified: libtool.eclass
Log:
Apply install-sh patches
Revision Changes Path
1.78 eclass/libtool.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.78&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.78&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?r1=1.77&r2=1.78
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- libtool.eclass 14 Sep 2007 06:49:45 -0000 1.77
+++ libtool.eclass 14 Sep 2007 11:38:01 -0000 1.78
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.77 2007/09/14 06:49:45 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.78 2007/09/14 11:38:01 uberlord Exp $
#
# Maintainer: base-system@gentoo.org
#
@@ -122,7 +122,7 @@
local do_uclibc="yes"
local deptoremove=
local my_dirlist=
- local elt_patches="ltmain portage relink max_cmd_len sed test tmp"
+ local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp"
local start_dir=${PWD}
my_dirlist=$(ELT_find_ltmain_sh)
@@ -261,6 +261,10 @@
ret=$?
fi
;;
+ "install-sh")
+ ELT_walk_patches "${x}/install-sh" "${y}"
+ ret=$?
+ ;;
*)
ELT_walk_patches "${x}/ltmain.sh" "${y}"
ret=$?
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2007-09-14 16:25 Roy Marples (uberlord)
0 siblings, 0 replies; 24+ messages in thread
From: Roy Marples (uberlord) @ 2007-09-14 16:25 UTC (permalink / raw
To: gentoo-commits
uberlord 07/09/14 16:25:10
Modified: libtool.eclass
Log:
Drop the ltmain patch as that breaks KDE on linux apparently. Sucks for BSD eh?, #192495
Revision Changes Path
1.79 eclass/libtool.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.79&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.79&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?r1=1.78&r2=1.79
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- libtool.eclass 14 Sep 2007 11:38:01 -0000 1.78
+++ libtool.eclass 14 Sep 2007 16:25:10 -0000 1.79
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.78 2007/09/14 11:38:01 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.79 2007/09/14 16:25:10 uberlord Exp $
#
# Maintainer: base-system@gentoo.org
#
@@ -122,7 +122,7 @@
local do_uclibc="yes"
local deptoremove=
local my_dirlist=
- local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp"
+ local elt_patches="install-sh portage relink max_cmd_len sed test tmp"
local start_dir=${PWD}
my_dirlist=$(ELT_find_ltmain_sh)
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2007-09-15 6:55 Roy Marples (uberlord)
0 siblings, 0 replies; 24+ messages in thread
From: Roy Marples (uberlord) @ 2007-09-15 6:55 UTC (permalink / raw
To: gentoo-commits
uberlord 07/09/15 06:55:43
Modified: libtool.eclass
Log:
Restore the ltmain dir as the issue affecting BSD (-pthread) vs Linux (-lpthread) has been fixed
Revision Changes Path
1.80 eclass/libtool.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.80&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.80&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?r1=1.79&r2=1.80
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- libtool.eclass 14 Sep 2007 16:25:10 -0000 1.79
+++ libtool.eclass 15 Sep 2007 06:55:42 -0000 1.80
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.79 2007/09/14 16:25:10 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.80 2007/09/15 06:55:42 uberlord Exp $
#
# Maintainer: base-system@gentoo.org
#
@@ -122,7 +122,7 @@
local do_uclibc="yes"
local deptoremove=
local my_dirlist=
- local elt_patches="install-sh portage relink max_cmd_len sed test tmp"
+ local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp"
local start_dir=${PWD}
my_dirlist=$(ELT_find_ltmain_sh)
--
gentoo-commits@gentoo.org mailing list
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2008-07-31 20:01 Samuli Suominen (drac)
0 siblings, 0 replies; 24+ messages in thread
From: Samuli Suominen (drac) @ 2008-07-31 20:01 UTC (permalink / raw
To: gentoo-commits
drac 08/07/31 20:01:44
Modified: libtool.eclass
Log:
Replace touch with bash redirection, so that it doesn't depend on coreutils. It doesn't have to.
Revision Changes Path
1.81 eclass/libtool.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.81&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.81&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?r1=1.80&r2=1.81
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- libtool.eclass 15 Sep 2007 06:55:42 -0000 1.80
+++ libtool.eclass 31 Jul 2008 20:01:43 -0000 1.81
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.80 2007/09/15 06:55:42 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.81 2008/07/31 20:01:43 drac Exp $
#
# Maintainer: base-system@gentoo.org
#
@@ -346,7 +346,7 @@
[[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
- touch "${x}/.elibtoolized"
+ >> "${x}/.elibtoolized"
done
cd "${start_dir}"
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2009-03-14 13:02 Mike Frysinger (vapier)
0 siblings, 0 replies; 24+ messages in thread
From: Mike Frysinger (vapier) @ 2009-03-14 13:02 UTC (permalink / raw
To: gentoo-commits
vapier 09/03/14 13:02:08
Modified: libtool.eclass
Log:
start an elibtoolize cross category #262042 by Sven Rebhan.
Revision Changes Path
1.82 eclass/libtool.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.82&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.82&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?r1=1.81&r2=1.82
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- libtool.eclass 31 Jul 2008 20:01:43 -0000 1.81
+++ libtool.eclass 14 Mar 2009 13:02:08 -0000 1.82
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.81 2008/07/31 20:01:43 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.82 2009/03/14 13:02:08 vapier Exp $
#
# Maintainer: base-system@gentoo.org
#
@@ -15,6 +15,8 @@
ELIBTOOL_VERSION="2.0.2"
+inherit toolchain-funcs
+
ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
ELT_APPLIED_PATCHES=
ELT_LTMAIN_SH=
@@ -122,7 +124,7 @@
local do_uclibc="yes"
local deptoremove=
local my_dirlist=
- local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp"
+ local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross"
local start_dir=${PWD}
my_dirlist=$(ELT_find_ltmain_sh)
@@ -265,6 +267,12 @@
ELT_walk_patches "${x}/install-sh" "${y}"
ret=$?
;;
+ "cross")
+ if tc-is-cross-compiler ; then
+ ELT_walk_patches "${x}/ltmain.sh" "${y}"
+ ret=$?
+ fi
+ ;;
*)
ELT_walk_patches "${x}/ltmain.sh" "${y}"
ret=$?
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2010-01-27 20:41 Fabian Groffen (grobian)
0 siblings, 0 replies; 24+ messages in thread
From: Fabian Groffen (grobian) @ 2010-01-27 20:41 UTC (permalink / raw
To: gentoo-commits
grobian 10/01/27 20:41:27
Modified: libtool.eclass
Log:
Activate Prefix ELT-patches when and where necessary, acked by base-system, bug #301190
Revision Changes Path
1.84 eclass/libtool.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.84&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.84&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?r1=1.83&r2=1.84
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- libtool.eclass 3 May 2009 20:03:10 -0000 1.83
+++ libtool.eclass 27 Jan 2010 20:41:27 -0000 1.84
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.83 2009/05/03 20:03:10 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.84 2010/01/27 20:41:27 grobian Exp $
#
# Maintainer: base-system@gentoo.org
#
@@ -174,11 +174,26 @@
[[ ${do_uclibc} == "yes" ]] && \
elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
- [[ ${CHOST} == *"-freebsd"* ]] && \
- elt_patches="${elt_patches} fbsd-conf fbsd-ltconf"
-
- [[ ${CHOST} == *"-darwin"* ]] && \
- elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
+ case "${CHOST}" in
+ *-aix*)
+ elt_patches="${elt_patches} hardcode aixrtl"
+ ;;
+ *-darwin*)
+ elt_patches="${elt_patches} darwin-ltconf darwin-ltmain darwin-conf"
+ ;;
+ *-freebsd*)
+ elt_patches="${elt_patches} fbsd-conf fbsd-ltconf"
+ ;;
+ *-hpux*)
+ elt_patches="${elt_patches} hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc"
+ ;;
+ *-irix*)
+ elt_patches="${elt_patches} irix-ltmain"
+ ;;
+ *-mint*)
+ elt_patches="${elt_patches} mint-conf"
+ ;;
+ esac
for x in ${my_dirlist} ; do
local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
@@ -260,6 +275,18 @@
ret=$?
fi
;;
+ "darwin-conf")
+ if [[ -e ${x}/configure && \
+ -n $(grep '&& echo \.so ||' "${x}/configure") ]] ; then
+ ELT_walk_patches "${x}/configure" "${y}"
+ ret=$?
+ # ltmain.sh and co might be in a subdirectory ...
+ elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
+ -n $(grep '&& echo \.so ||' "${x}/../configure") ]] ; then
+ ELT_walk_patches "${x}/../configure" "${y}"
+ ret=$?
+ fi
+ ;;
"darwin-ltconf")
# Newer libtoolize clears ltconfig, as not used anymore
if [[ -s ${x}/ltconfig ]] ; then
@@ -267,6 +294,32 @@
ret=$?
fi
;;
+ "darwin-ltmain")
+ # special case to avoid false positives (failing to apply
+ # ltmain.sh path message), newer libtools have this patch
+ # built in, so not much to patch around then
+ if [[ -e ${x}/ltmain.sh && \
+ -z $(grep 'verstring="-compatibility_version' "${x}/ltmain.sh") ]] ; then
+ ELT_walk_patches "${x}/ltmain.sh" "${y}"
+ ret=$?
+ fi
+ ;;
+ "aixrtl" | "hpux-conf" | "mint-conf" )
+ ret=1
+ local subret=1
+ if [[ -e ${x}/configure ]]; then
+ ELT_walk_patches "${x}/configure" "${y}"
+ subret=$?
+ # ltmain.sh and co might be in a subdirectory ...
+ elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] ; then
+ ELT_walk_patches "${x}/../configure" "${y}"
+ subret=$?
+ fi
+ if [[ $subret -eq 0 ]]; then
+ # have at least one patch succeeded.
+ ret=0
+ fi
+ ;;
"install-sh")
ELT_walk_patches "${x}/install-sh" "${y}"
ret=$?
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2010-03-12 8:17 Michael Haubenwallner (haubi)
0 siblings, 0 replies; 24+ messages in thread
From: Michael Haubenwallner (haubi) @ 2010-03-12 8:17 UTC (permalink / raw
To: gentoo-commits
haubi 10/03/12 08:17:40
Modified: libtool.eclass
Log:
aixrtl and hpux-conf _need_ to apply in a loop, mint-conf does not,
(loop dropped in http://overlays.gentoo.org/proj/alt/changeset/55797)
Revision Changes Path
1.85 eclass/libtool.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.85&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.85&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?r1=1.84&r2=1.85
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- libtool.eclass 27 Jan 2010 20:41:27 -0000 1.84
+++ libtool.eclass 12 Mar 2010 08:17:40 -0000 1.85
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.84 2010/01/27 20:41:27 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.85 2010/03/12 08:17:40 haubi Exp $
#
# Maintainer: base-system@gentoo.org
#
@@ -304,7 +304,27 @@
ret=$?
fi
;;
- "aixrtl" | "hpux-conf" | "mint-conf" )
+ "aixrtl" | "hpux-conf")
+ ret=1
+ local subret=0
+ # apply multiple patches as often as they match
+ while [[ $subret -eq 0 ]]; do
+ subret=1
+ if [[ -e ${x}/configure ]]; then
+ ELT_walk_patches "${x}/configure" "${y}"
+ subret=$?
+ # ltmain.sh and co might be in a subdirectory ...
+ elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] ; then
+ ELT_walk_patches "${x}/../configure" "${y}"
+ subret=$?
+ fi
+ if [[ $subret -eq 0 ]]; then
+ # have at least one patch succeeded.
+ ret=0
+ fi
+ done
+ ;;
+ "mint-conf")
ret=1
local subret=1
if [[ -e ${x}/configure ]]; then
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2010-04-14 2:13 Mike Frysinger (vapier)
0 siblings, 0 replies; 24+ messages in thread
From: Mike Frysinger (vapier) @ 2010-04-14 2:13 UTC (permalink / raw
To: gentoo-commits
vapier 10/04/14 02:13:54
Modified: libtool.eclass
Log:
rewrite ELT_walk_patches to handle path name as well as locale issues pointed out by Michał Górny #314493
Revision Changes Path
1.86 eclass/libtool.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?r1=1.85&r2=1.86
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- libtool.eclass 12 Mar 2010 08:17:40 -0000 1.85
+++ libtool.eclass 14 Apr 2010 02:13:54 -0000 1.86
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.85 2010/03/12 08:17:40 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.86 2010/04/14 02:13:54 vapier Exp $
#
# Maintainer: base-system@gentoo.org
#
@@ -76,43 +76,38 @@
# apply to $1 ...
#
ELT_walk_patches() {
- local x=
- local y=
+ local patch
local ret=1
local file=$1
local patch_set=$2
- local patch_dir=
+ local patch_dir="${ELT_PATCH_DIR}/${patch_set}"
local rem_int_dep=$3
- if [[ -n ${patch_set} ]] ; then
- if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then
- patch_dir="${ELT_PATCH_DIR}/${patch_set}"
- else
- return "${ret}"
- fi
+ [[ -z ${patch_set} ]] && return 1
+ [[ ! -d ${patch_dir} ]] && return 1
- # Go through the patches in reverse order (large to small)
- for x in $(ls -d "${patch_dir}"/* 2> /dev/null | grep -v 'CVS' | sort -r) ; do
- if [[ -n ${x} && -f ${x} ]] ; then
- # For --remove-internal-dep ...
- if [[ -n ${rem_int_dep} ]] ; then
- # For replace @REM_INT_DEP@ with what was passed
- # to --remove-internal-dep
- sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
- "${T}/$$.rem_int_deps.patch"
+ pushd "${ELT_PATCH_DIR}" >/dev/null
- x="${T}/$$.rem_int_deps.patch"
- fi
+ # Go through the patches in reverse order (newer version to older)
+ for patch in $(find "${patch_set}" -maxdepth 1 -type f | LC_ALL=C sort -r) ; do
+ # For --remove-internal-dep ...
+ if [[ -n ${rem_int_dep} ]] ; then
+ # For replace @REM_INT_DEP@ with what was passed
+ # to --remove-internal-dep
+ local tmp="${T}/$$.rem_int_deps.patch"
+ sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" "${patch}" > "${tmp}"
+ patch=${tmp}
+ fi
- if ELT_try_and_apply_patch "${file}" "${x}" ; then
- ret=0
- break
- fi
- fi
- done
- fi
+ if ELT_try_and_apply_patch "${file}" "${patch}" ; then
+ # Break to unwind w/popd rather than return directly
+ ret=0
+ break
+ fi
+ done
- return "${ret}"
+ popd "${patch_dir}" >/dev/null
+ return ${ret}
}
elibtoolize() {
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2010-04-14 18:14 Mike Frysinger (vapier)
0 siblings, 0 replies; 24+ messages in thread
From: Mike Frysinger (vapier) @ 2010-04-14 18:14 UTC (permalink / raw
To: gentoo-commits
vapier 10/04/14 18:14:45
Modified: libtool.eclass
Log:
drop spurious arg to popd #314493
Revision Changes Path
1.87 eclass/libtool.eclass
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.87&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?rev=1.87&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/libtool.eclass?r1=1.86&r2=1.87
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- libtool.eclass 14 Apr 2010 02:13:54 -0000 1.86
+++ libtool.eclass 14 Apr 2010 18:14:45 -0000 1.87
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.86 2010/04/14 02:13:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.87 2010/04/14 18:14:45 vapier Exp $
#
# Maintainer: base-system@gentoo.org
#
@@ -106,7 +106,7 @@
fi
done
- popd "${patch_dir}" >/dev/null
+ popd >/dev/null
return ${ret}
}
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2010-05-11 4:45 Mike Frysinger (vapier)
0 siblings, 0 replies; 24+ messages in thread
From: Mike Frysinger (vapier) @ 2010-05-11 4:45 UTC (permalink / raw
To: gentoo-commits
vapier 10/05/11 04:45:48
Modified: libtool.eclass
Log:
change bug notice to report a bug rather than annoy specific people
Revision Changes Path
1.88 eclass/libtool.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.87&r2=1.88
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- libtool.eclass 14 Apr 2010 18:14:45 -0000 1.87
+++ libtool.eclass 11 May 2010 04:45:48 -0000 1.88
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.87 2010/04/14 18:14:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.88 2010/05/11 04:45:48 vapier Exp $
#
# Maintainer: base-system@gentoo.org
#
@@ -370,7 +370,7 @@
if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
echo
eerror "Portage patch requested, but failed to apply!"
- eerror "Please bug azarah or vapier to add proper patch."
+ eerror "Please file a bug report to add a proper patch."
die "Portage patch requested, but failed to apply!"
fi
else
@@ -385,7 +385,7 @@
echo
eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
- eerror "Please bug azarah or vapier to add proper patch."
+ eerror "Please file a bug report to add a proper patch."
die "Portage patch failed to apply!"
fi
# We do not want to run libtoolize ...
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2010-08-22 22:44 Mike Frysinger (vapier)
0 siblings, 0 replies; 24+ messages in thread
From: Mike Frysinger (vapier) @ 2010-08-22 22:44 UTC (permalink / raw
To: gentoo-commits
vapier 10/08/22 22:44:45
Modified: libtool.eclass
Log:
clean up the elcass a bit -- drop dead code, add documentation, etc...
Revision Changes Path
1.90 eclass/libtool.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.90&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.90&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.89&r2=1.90
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- libtool.eclass 20 May 2010 08:22:15 -0000 1.89
+++ libtool.eclass 22 Aug 2010 22:44:45 -0000 1.90
@@ -1,9 +1,12 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.89 2010/05/20 08:22:15 haubi Exp $
-#
-# Maintainer: base-system@gentoo.org
-#
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.90 2010/08/22 22:44:45 vapier Exp $
+
+# @ECLASS: libtool.eclass
+# @MAINTAINER:
+# base-system@gentoo.org
+# @BLURB: quickly update bundled libtool code
+# @DESCRIPTION:
# This eclass patches ltmain.sh distributed with libtoolized packages with the
# relink and portage patch among others
#
@@ -13,27 +16,9 @@
DESCRIPTION="Based on the ${ECLASS} eclass"
-ELIBTOOL_VERSION="2.0.2"
-
inherit toolchain-funcs
ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
-ELT_APPLIED_PATCHES=
-ELT_LTMAIN_SH=
-
-#
-# Returns all the directories containing ltmain.sh
-#
-ELT_find_ltmain_sh() {
- local x=
- local dirlist=
-
- for x in $(find "${S}" -name 'ltmain.sh') ; do
- dirlist="${dirlist} ${x%/*}"
- done
-
- echo "${dirlist}"
-}
#
# See if we can apply $2 on $1, and if so, do it
@@ -61,14 +46,11 @@
# Get string version of ltmain.sh or ltconfig (passed as $1)
#
ELT_libtool_version() {
- local ltmain_sh=$1
- local version=
-
- version=$(eval $(grep -e '^[[:space:]]*VERSION=' "${ltmain_sh}"); \
- echo "${VERSION}")
- [[ -z ${version} ]] && version="0"
-
- echo "${version}"
+ (
+ unset VERSION
+ eval $(grep -e '^[[:space:]]*VERSION=' "$1")
+ echo "${VERSION:-0}"
+ )
}
#
@@ -110,54 +92,56 @@
return ${ret}
}
+# @FUNCTION: elibtoolize
+# @USAGE: [dirs] [--portage] [--reverse-deps] [--patch-only] [--remove-internal-dep=xxx] [--shallow] [--no-uclibc]
+# @DESCRIPTION:
+# Apply a smorgasbord of patches to bundled libtool files. This function
+# should always be safe to run. If no directories are specified, then
+# ${S} will be searched for appropriate files.
+#
+# If the --shallow option is used, then only ${S}/ltmain.sh will be patched.
+#
+# The other options should be avoided in general unless you know what's going on.
elibtoolize() {
- local x=
- local y=
+ local x
local do_portage="no"
local do_reversedeps="no"
local do_only_patches="no"
local do_uclibc="yes"
local deptoremove=
- local my_dirlist=
+ local do_shallow="no"
local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed"
- local start_dir=${PWD}
-
- my_dirlist=$(ELT_find_ltmain_sh)
for x in "$@" ; do
- case "${x}" in
- "--portage")
+ case ${x} in
+ --portage)
# Only apply portage patch, and don't
# 'libtoolize --copy --force' if all patches fail.
do_portage="yes"
;;
- "--reverse-deps")
+ --reverse-deps)
# Apply the reverse-deps patch
# http://bugzilla.gnome.org/show_bug.cgi?id=75635
do_reversedeps="yes"
- elt_patches="${elt_patches} fix-relink"
+ elt_patches+=" fix-relink"
;;
- "--patch-only")
+ --patch-only)
# Do not run libtoolize if none of the patches apply ..
do_only_patches="yes"
;;
- "^--remove-internal-dep="*)
+ --remove-internal-dep=*)
# We will replace @REM_INT_DEP@ with what is needed
# in ELT_walk_patches() ...
- deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||')
+ deptoremove=${x#--remove-internal-dep=}
# Add the patch for this ...
- [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep"
+ [[ -n ${deptoremove} ]] && elt_patches+=" rem-int-dep"
;;
- "--shallow")
+ --shallow)
# Only patch the ltmain.sh in ${S}
- if [[ -f ${S}/ltmain.sh ]] ; then
- my_dirlist=${S}
- else
- my_dirlist=
- fi
+ do_shallow="yes"
;;
- "--no-uclibc")
+ --no-uclibc)
do_uclibc="no"
;;
*)
@@ -166,151 +150,141 @@
esac
done
- [[ ${do_uclibc} == "yes" ]] && \
- elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
+ [[ ${do_uclibc} == "yes" ]] && elt_patches+=" uclibc-conf uclibc-ltconf"
- case "${CHOST}" in
- *-aix*) # see bug #213277
- elt_patches="${elt_patches} hardcode aixrtl aix-noundef"
- ;;
- *-darwin*)
- elt_patches="${elt_patches} darwin-ltconf darwin-ltmain darwin-conf"
- ;;
- *-freebsd*)
- elt_patches="${elt_patches} fbsd-conf fbsd-ltconf"
- ;;
- *-hpux*)
- elt_patches="${elt_patches} hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc"
- ;;
- *-irix*)
- elt_patches="${elt_patches} irix-ltmain"
- ;;
- *-mint*)
- elt_patches="${elt_patches} mint-conf"
- ;;
+ case ${CHOST} in
+ *-aix*) elt_patches+=" hardcode aixrtl aix-noundef" ;; #213277
+ *-darwin*) elt_patches+=" darwin-ltconf darwin-ltmain darwin-conf" ;;
+ *-freebsd*) elt_patches+=" fbsd-conf fbsd-ltconf" ;;
+ *-hpux*) elt_patches+=" hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc" ;;
+ *-irix*) elt_patches+=" irix-ltmain" ;;
+ *-mint*) elt_patches+=" mint-conf" ;;
esac
- for x in ${my_dirlist} ; do
- local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
+ # Reuse "$@" for dirs to patch
+ set --
+ if [[ ${do_shallow} == "yes" ]] ; then
+ [[ -f ${S}/ltmain.sh ]] && set -- "${S}"
+ else
+ set -- $(find "${S}" -name ltmain.sh -printf '%h ')
+ fi
+
+ local d p
+ for d in "$@" ; do
export ELT_APPLIED_PATCHES=
- export ELT_LTMAIN_SH="${x}/ltmain.sh"
- [[ -f ${x}/.elibtoolized ]] && continue
+ [[ -f ${d}/.elibtoolized ]] && continue
- cd ${x}
- einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
+ einfo "Running elibtoolize in: ${d#${WORKDIR}/}/"
- for y in ${elt_patches} ; do
+ for p in ${elt_patches} ; do
local ret=0
- case "${y}" in
- "portage")
+ case ${p} in
+ portage)
# Stupid test to see if its already applied ...
- if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
- ELT_walk_patches "${x}/ltmain.sh" "${y}"
+ if ! grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then
+ ELT_walk_patches "${d}/ltmain.sh" "${p}"
ret=$?
fi
;;
- "rem-int-dep")
- ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
+ rem-int-dep)
+ ELT_walk_patches "${d}/ltmain.sh" "${p}" "${deptoremove}"
ret=$?
;;
- "fix-relink")
+ fix-relink)
# Do not apply if we do not have the relink patch applied ...
- if [[ -n $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then
- ELT_walk_patches "${x}/ltmain.sh" "${y}"
+ if grep -qs 'inst_prefix_dir' "${d}/ltmain.sh" ; then
+ ELT_walk_patches "${d}/ltmain.sh" "${p}"
ret=$?
fi
;;
- "max_cmd_len")
+ max_cmd_len)
# Do not apply if $max_cmd_len is not used ...
- if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
- ELT_walk_patches "${x}/ltmain.sh" "${y}"
+ if grep -qs 'max_cmd_len' "${d}/ltmain.sh" ; then
+ ELT_walk_patches "${d}/ltmain.sh" "${p}"
ret=$?
fi
;;
- "as-needed")
- ELT_walk_patches "${x}/ltmain.sh" "${y}"
+ as-needed)
+ ELT_walk_patches "${d}/ltmain.sh" "${p}"
ret=$?
;;
- "uclibc-conf")
- if [[ -e ${x}/configure && \
- -n $(grep 'Transform linux' "${x}/configure") ]] ; then
- ELT_walk_patches "${x}/configure" "${y}"
+ uclibc-conf)
+ if grep -qs 'Transform linux' "${d}/configure" ; then
+ ELT_walk_patches "${d}/configure" "${p}"
ret=$?
# ltmain.sh and co might be in a subdirectory ...
- elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
- -n $(grep 'Transform linux' "${x}/../configure") ]] ; then
- ELT_walk_patches "${x}/../configure" "${y}"
+ elif [[ ! -e ${d}/configure ]] && \
+ grep -qs 'Transform linux' "${d}/../configure" ; then
+ ELT_walk_patches "${d}/../configure" "${p}"
ret=$?
fi
;;
- "uclibc-ltconf")
+ uclibc-ltconf)
# Newer libtoolize clears ltconfig, as not used anymore
- if [[ -s ${x}/ltconfig ]] ; then
- ELT_walk_patches "${x}/ltconfig" "${y}"
+ if [[ -s ${d}/ltconfig ]] ; then
+ ELT_walk_patches "${d}/ltconfig" "${p}"
ret=$?
fi
;;
- "fbsd-conf")
- if [[ -e ${x}/configure && \
- -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then
- ELT_walk_patches "${x}/configure" "${y}"
+ fbsd-conf)
+ if grep -qs 'version_type=freebsd-' "${d}/configure" ; then
+ ELT_walk_patches "${d}/configure" "${p}"
ret=$?
# ltmain.sh and co might be in a subdirectory ...
- elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
- -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
- ELT_walk_patches "${x}/../configure" "${y}"
+ elif [[ ! -e ${d}/configure ]] && \
+ grep -qs 'version_type=freebsd-' "${d}/../configure" ; then
+ ELT_walk_patches "${d}/../configure" "${p}"
ret=$?
fi
;;
- "fbsd-ltconf")
- if [[ -s ${x}/ltconfig ]] ; then
- ELT_walk_patches "${x}/ltconfig" "${y}"
+ fbsd-ltconf)
+ if [[ -s ${d}/ltconfig ]] ; then
+ ELT_walk_patches "${d}/ltconfig" "${p}"
ret=$?
fi
;;
- "darwin-conf")
- if [[ -e ${x}/configure && \
- -n $(grep '&& echo \.so ||' "${x}/configure") ]] ; then
- ELT_walk_patches "${x}/configure" "${y}"
+ darwin-conf)
+ if grep -qs '&& echo \.so ||' "${d}/configure" ; then
+ ELT_walk_patches "${d}/configure" "${p}"
ret=$?
# ltmain.sh and co might be in a subdirectory ...
- elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
- -n $(grep '&& echo \.so ||' "${x}/../configure") ]] ; then
- ELT_walk_patches "${x}/../configure" "${y}"
+ elif [[ ! -e ${d}/configure ]] && \
+ grep -qs '&& echo \.so ||' "${d}/../configure" ; then
+ ELT_walk_patches "${d}/../configure" "${p}"
ret=$?
fi
;;
- "darwin-ltconf")
+ darwin-ltconf)
# Newer libtoolize clears ltconfig, as not used anymore
- if [[ -s ${x}/ltconfig ]] ; then
- ELT_walk_patches "${x}/ltconfig" "${y}"
+ if [[ -s ${d}/ltconfig ]] ; then
+ ELT_walk_patches "${d}/ltconfig" "${p}"
ret=$?
fi
;;
- "darwin-ltmain")
+ darwin-ltmain)
# special case to avoid false positives (failing to apply
# ltmain.sh path message), newer libtools have this patch
# built in, so not much to patch around then
- if [[ -e ${x}/ltmain.sh && \
- -z $(grep 'verstring="-compatibility_version' "${x}/ltmain.sh") ]] ; then
- ELT_walk_patches "${x}/ltmain.sh" "${y}"
+ if [[ -e ${d}/ltmain.sh ]] && \
+ ! grep -qs 'verstring="-compatibility_version' "${d}/ltmain.sh" ; then
+ ELT_walk_patches "${d}/ltmain.sh" "${p}"
ret=$?
fi
;;
- "aixrtl" | "hpux-conf")
+ aixrtl|hpux-conf)
ret=1
local subret=0
# apply multiple patches as often as they match
while [[ $subret -eq 0 ]]; do
subret=1
- if [[ -e ${x}/configure ]]; then
- ELT_walk_patches "${x}/configure" "${y}"
+ if [[ -e ${d}/configure ]]; then
+ ELT_walk_patches "${d}/configure" "${p}"
subret=$?
# ltmain.sh and co might be in a subdirectory ...
- elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] ; then
- ELT_walk_patches "${x}/../configure" "${y}"
+ elif [[ ! -e ${d}/configure && -e ${d}/../configure ]] ; then
+ ELT_walk_patches "${d}/../configure" "${p}"
subret=$?
fi
if [[ $subret -eq 0 ]]; then
@@ -319,15 +293,15 @@
fi
done
;;
- "mint-conf")
+ mint-conf)
ret=1
local subret=1
- if [[ -e ${x}/configure ]]; then
- ELT_walk_patches "${x}/configure" "${y}"
+ if [[ -e ${d}/configure ]]; then
+ ELT_walk_patches "${d}/configure" "${p}"
subret=$?
# ltmain.sh and co might be in a subdirectory ...
- elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] ; then
- ELT_walk_patches "${x}/../configure" "${y}"
+ elif [[ ! -e ${d}/configure && -e ${d}/../configure ]] ; then
+ ELT_walk_patches "${d}/../configure" "${p}"
subret=$?
fi
if [[ $subret -eq 0 ]]; then
@@ -335,54 +309,51 @@
ret=0
fi
;;
- "install-sh")
- ELT_walk_patches "${x}/install-sh" "${y}"
+ install-sh)
+ ELT_walk_patches "${d}/install-sh" "${p}"
ret=$?
;;
- "cross")
+ cross)
if tc-is-cross-compiler ; then
- ELT_walk_patches "${x}/ltmain.sh" "${y}"
+ ELT_walk_patches "${d}/ltmain.sh" "${p}"
ret=$?
fi
;;
*)
- ELT_walk_patches "${x}/ltmain.sh" "${y}"
+ ELT_walk_patches "${d}/ltmain.sh" "${p}"
ret=$?
;;
esac
if [[ ${ret} -ne 0 ]] ; then
- case ${y} in
- "relink")
- local version=$(ELT_libtool_version "${x}/ltmain.sh")
+ case ${p} in
+ relink)
+ local version=$(ELT_libtool_version "${d}/ltmain.sh")
# Critical patch, but could be applied ...
# FIXME: Still need a patch for ltmain.sh > 1.4.0
- if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \
- $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
+ if ! grep -qs 'inst_prefix_dir' "${d}/ltmain.sh" && \
+ [[ $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
ewarn " Could not apply relink.patch!"
fi
;;
- "portage")
+ portage)
# Critical patch - for this one we abort, as it can really
# cause breakage without it applied!
if [[ ${do_portage} == "yes" ]] ; then
# Stupid test to see if its already applied ...
- if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
+ if ! grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then
echo
eerror "Portage patch requested, but failed to apply!"
eerror "Please file a bug report to add a proper patch."
die "Portage patch requested, but failed to apply!"
fi
else
- if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
+ if grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then
# ewarn " Portage patch seems to be already applied."
# ewarn " Please verify that it is not needed."
:
else
- local version=$( \
- eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
- echo "${VERSION}")
-
+ local version=$(ELT_libtool_version "${d}"/ltmain.sh)
echo
eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
eerror "Please file a bug report to add a proper patch."
@@ -392,22 +363,20 @@
ELT_APPLIED_PATCHES="portage"
fi
;;
- "uclibc-"*)
- [[ ${CHOST} == *"-uclibc" ]] && \
- ewarn " uClibc patch set '${y}' failed to apply!"
+ uclibc-*)
+ [[ ${CHOST} == *-uclibc ]] && ewarn " uClibc patch set '${p}' failed to apply!"
;;
- "fbsd-"*)
- if [[ ${CHOST} == *"-freebsd"* ]] ; then
+ fbsd-*)
+ if [[ ${CHOST} == *-freebsd* ]] ; then
if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
- "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then
- eerror " FreeBSD patch set '${y}' failed to apply!"
- die "FreeBSD patch set '${y}' failed to apply!"
+ "${d}/configure" "${d}/../configure" 2>/dev/null) ]]; then
+ eerror " FreeBSD patch set '${p}' failed to apply!"
+ die "FreeBSD patch set '${p}' failed to apply!"
fi
fi
;;
- "darwin-"*)
- [[ ${CHOST} == *"-darwin"* ]] && \
- ewarn " Darwin patch set '${y}' failed to apply!"
+ darwin-*)
+ [[ ${CHOST} == *"-darwin"* ]] && ewarn " Darwin patch set '${p}' failed to apply!"
;;
esac
fi
@@ -424,23 +393,14 @@
fi
fi
- [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
+ rm -f "${d}/libtool"
- >> "${x}/.elibtoolized"
+ > "${d}/.elibtoolized"
done
-
- cd "${start_dir}"
}
-uclibctoolize() {
- ewarn "uclibctoolize() is deprecated, please just use elibtoolize()!"
- elibtoolize
-}
-
-darwintoolize() {
- ewarn "darwintoolize() is deprecated, please just use elibtoolize()!"
- elibtoolize
-}
+uclibctoolize() { die "Use elibtoolize"; }
+darwintoolize() { die "Use elibtoolize"; }
# char *VER_major(string)
#
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2011-06-09 15:53 Diego Petteno (flameeyes)
0 siblings, 0 replies; 24+ messages in thread
From: Diego Petteno (flameeyes) @ 2011-06-09 15:53 UTC (permalink / raw
To: gentoo-commits
flameeyes 11/06/09 15:53:04
Modified: libtool.eclass
Log:
Add a gold-specific patch when gold is used as linker, as only libtool 2.2.7 and later actually report it properly. Check two parents directories for configure as sometimes it would otherwise fail (libarchive), and make the debug log a bit more useful by appending rather than replacing and adding the name of the patch/file it gets tested on.
Revision Changes Path
1.91 eclass/libtool.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.90&r2=1.91
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- libtool.eclass 22 Aug 2010 22:44:45 -0000 1.90
+++ libtool.eclass 9 Jun 2011 15:53:04 -0000 1.91
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.90 2010/08/22 22:44:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.91 2011/06/09 15:53:04 flameeyes Exp $
# @ECLASS: libtool.eclass
# @MAINTAINER:
@@ -28,11 +28,16 @@
local file=$1
local patch=$2
+ (
+ echo ""
+ echo "Trying $(basename "$(dirname "${patch}")")-${patch##*/}.patch on ${file}"
+ ) &>> "${T}/elibtool.log"
+
# We only support patchlevel of 0 - why worry if its static patches?
- if patch -p0 --dry-run "${file}" "${patch}" &> "${T}/elibtool.log" ; then
+ if patch -p0 --dry-run "${file}" "${patch}" &>> "${T}/elibtool.log" ; then
einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \
- &> "${T}/elibtool.log"
+ &>> "${T}/elibtool.log"
ret=$?
export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
else
@@ -161,6 +166,10 @@
*-mint*) elt_patches+=" mint-conf" ;;
esac
+ if $(tc-getLD) --version 2>&1 | grep -qs 'GNU gold'; then
+ elt_patches+=" gold-conf"
+ fi
+
# Reuse "$@" for dirs to patch
set --
if [[ ${do_shallow} == "yes" ]] ; then
@@ -216,7 +225,7 @@
ret=$?
# ltmain.sh and co might be in a subdirectory ...
elif [[ ! -e ${d}/configure ]] && \
- grep -qs 'Transform linux' "${d}/../configure" ; then
+ grep -qs 'Transform linux' "${d}/../configure" ; then
ELT_walk_patches "${d}/../configure" "${p}"
ret=$?
fi
@@ -234,7 +243,7 @@
ret=$?
# ltmain.sh and co might be in a subdirectory ...
elif [[ ! -e ${d}/configure ]] && \
- grep -qs 'version_type=freebsd-' "${d}/../configure" ; then
+ grep -qs 'version_type=freebsd-' "${d}/../configure" ; then
ELT_walk_patches "${d}/../configure" "${p}"
ret=$?
fi
@@ -251,7 +260,7 @@
ret=$?
# ltmain.sh and co might be in a subdirectory ...
elif [[ ! -e ${d}/configure ]] && \
- grep -qs '&& echo \.so ||' "${d}/../configure" ; then
+ grep -qs '&& echo \.so ||' "${d}/../configure" ; then
ELT_walk_patches "${d}/../configure" "${p}"
ret=$?
fi
@@ -293,16 +302,19 @@
fi
done
;;
- mint-conf)
+ mint-conf|gold-conf)
ret=1
local subret=1
if [[ -e ${d}/configure ]]; then
ELT_walk_patches "${d}/configure" "${p}"
subret=$?
# ltmain.sh and co might be in a subdirectory ...
- elif [[ ! -e ${d}/configure && -e ${d}/../configure ]] ; then
+ elif [[ -e ${d}/../configure ]] ; then
ELT_walk_patches "${d}/../configure" "${p}"
subret=$?
+ elif [[ -e ${d}/../../configure ]] ; then
+ ELT_walk_patches "${d}/../../configure" "${p}"
+ subret=$?
fi
if [[ $subret -eq 0 ]]; then
# have at least one patch succeeded.
@@ -353,7 +365,7 @@
# ewarn " Please verify that it is not needed."
:
else
- local version=$(ELT_libtool_version "${d}"/ltmain.sh)
+ local version=$(ELT_libtool_version "${d}"/ltmain.sh)
echo
eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
eerror "Please file a bug report to add a proper patch."
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2011-06-10 10:14 Diego Petteno (flameeyes)
0 siblings, 0 replies; 24+ messages in thread
From: Diego Petteno (flameeyes) @ 2011-06-10 10:14 UTC (permalink / raw
To: gentoo-commits
flameeyes 11/06/10 10:14:21
Modified: libtool.eclass
Log:
Use a safer syntax for libtool.eclass (bug #370983).
Revision Changes Path
1.92 eclass/libtool.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.92&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.92&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.91&r2=1.92
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- libtool.eclass 9 Jun 2011 15:53:04 -0000 1.91
+++ libtool.eclass 10 Jun 2011 10:14:21 -0000 1.92
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.91 2011/06/09 15:53:04 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.92 2011/06/10 10:14:21 flameeyes Exp $
# @ECLASS: libtool.eclass
# @MAINTAINER:
@@ -28,10 +28,8 @@
local file=$1
local patch=$2
- (
- echo ""
- echo "Trying $(basename "$(dirname "${patch}")")-${patch##*/}.patch on ${file}"
- ) &>> "${T}/elibtool.log"
+ echo -e "\nTrying $(basename "$(dirname "${patch}")")-${patch##*/}.patch on ${file}" \
+ &>> "${T}/elibtool.log"
# We only support patchlevel of 0 - why worry if its static patches?
if patch -p0 --dry-run "${file}" "${patch}" &>> "${T}/elibtool.log" ; then
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2011-06-10 16:17 Diego Petteno (flameeyes)
0 siblings, 0 replies; 24+ messages in thread
From: Diego Petteno (flameeyes) @ 2011-06-10 16:17 UTC (permalink / raw
To: gentoo-commits
flameeyes 11/06/10 16:17:57
Modified: libtool.eclass
Log:
Be compatible with bash3 as well.
Revision Changes Path
1.93 eclass/libtool.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.92&r2=1.93
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- libtool.eclass 10 Jun 2011 10:14:21 -0000 1.92
+++ libtool.eclass 10 Jun 2011 16:17:57 -0000 1.93
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.92 2011/06/10 10:14:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.93 2011/06/10 16:17:57 flameeyes Exp $
# @ECLASS: libtool.eclass
# @MAINTAINER:
@@ -29,13 +29,13 @@
local patch=$2
echo -e "\nTrying $(basename "$(dirname "${patch}")")-${patch##*/}.patch on ${file}" \
- &>> "${T}/elibtool.log"
+ >> "${T}/elibtool.log" 2>&1
# We only support patchlevel of 0 - why worry if its static patches?
- if patch -p0 --dry-run "${file}" "${patch}" &>> "${T}/elibtool.log" ; then
+ if patch -p0 --dry-run "${file}" "${patch}" >> "${T}/elibtool.log" 2>&1 ; then
einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \
- &>> "${T}/elibtool.log"
+ >> "${T}/elibtool.log" 2>&1
ret=$?
export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
else
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2011-10-03 4:04 Mike Frysinger (vapier)
0 siblings, 0 replies; 24+ messages in thread
From: Mike Frysinger (vapier) @ 2011-10-03 4:04 UTC (permalink / raw
To: gentoo-commits
vapier 11/10/03 04:04:46
Modified: libtool.eclass
Log:
clean up patch applying a bit, and add support for @GENTOO_LIBDIR@ replacements in patches
Revision Changes Path
1.94 eclass/libtool.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.93&r2=1.94
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- libtool.eclass 10 Jun 2011 16:17:57 -0000 1.93
+++ libtool.eclass 3 Oct 2011 04:04:46 -0000 1.94
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.93 2011/06/10 16:17:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.94 2011/10/03 04:04:46 vapier Exp $
# @ECLASS: libtool.eclass
# @MAINTAINER:
@@ -16,7 +16,7 @@
DESCRIPTION="Based on the ${ECLASS} eclass"
-inherit toolchain-funcs
+inherit multilib toolchain-funcs
ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
@@ -27,17 +27,22 @@
local ret=0
local file=$1
local patch=$2
-
- echo -e "\nTrying $(basename "$(dirname "${patch}")")-${patch##*/}.patch on ${file}" \
- >> "${T}/elibtool.log" 2>&1
+ local src=$3
+ local disp="${src} patch"
+ local log="${T}/elibtool.log"
+
+ if [[ -z ${__ELT_NOTED_TMP} ]] ; then
+ __ELT_NOTED_TMP=true
+ printf 'temp patch: %s\n' "${patch}" > "${log}"
+ fi
+ printf '\nTrying %s\n' "${disp}" >> "${log}"
# We only support patchlevel of 0 - why worry if its static patches?
- if patch -p0 --dry-run "${file}" "${patch}" >> "${T}/elibtool.log" 2>&1 ; then
- einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
- patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \
- >> "${T}/elibtool.log" 2>&1
+ if patch -p0 --dry-run "${file}" "${patch}" >> "${log}" 2>&1 ; then
+ einfo " Applying ${disp} ..."
+ patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" >> "${log}" 2>&1
ret=$?
- export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
+ export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${src}"
else
ret=1
fi
@@ -61,7 +66,7 @@
# apply to $1 ...
#
ELT_walk_patches() {
- local patch
+ local patch tmp
local ret=1
local file=$1
local patch_set=$2
@@ -71,20 +76,21 @@
[[ -z ${patch_set} ]] && return 1
[[ ! -d ${patch_dir} ]] && return 1
- pushd "${ELT_PATCH_DIR}" >/dev/null
+ # Allow patches to use @GENTOO_LIBDIR@ replacements
+ local sed_args=( -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" )
+ if [[ -n ${rem_int_dep} ]] ; then
+ # replace @REM_INT_DEP@ with what was passed
+ # to --remove-internal-dep
+ sed_args+=( -e "s|@REM_INT_DEP@|${rem_int_dep}|g" )
+ fi
+
+ pushd "${ELT_PATCH_DIR}" >/dev/null || die
# Go through the patches in reverse order (newer version to older)
for patch in $(find "${patch_set}" -maxdepth 1 -type f | LC_ALL=C sort -r) ; do
- # For --remove-internal-dep ...
- if [[ -n ${rem_int_dep} ]] ; then
- # For replace @REM_INT_DEP@ with what was passed
- # to --remove-internal-dep
- local tmp="${T}/$$.rem_int_deps.patch"
- sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" "${patch}" > "${tmp}"
- patch=${tmp}
- fi
-
- if ELT_try_and_apply_patch "${file}" "${patch}" ; then
+ tmp="${T}/libtool-elt.patch"
+ sed "${sed_args[@]}" "${patch}" > "${tmp}" || die
+ if ELT_try_and_apply_patch "${file}" "${tmp}" "${patch}" ; then
# Break to unwind w/popd rather than return directly
ret=0
break
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2011-11-18 17:32 Mike Frysinger (vapier)
0 siblings, 0 replies; 24+ messages in thread
From: Mike Frysinger (vapier) @ 2011-11-18 17:32 UTC (permalink / raw
To: gentoo-commits
vapier 11/11/18 17:32:14
Modified: libtool.eclass
Log:
allow overlays to specify eclass overrides without breaking libtools lookup of local patches #389009
Revision Changes Path
1.96 eclass/libtool.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.95&r2=1.96
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- libtool.eclass 14 Nov 2011 17:08:49 -0000 1.95
+++ libtool.eclass 18 Nov 2011 17:32:14 -0000 1.96
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.95 2011/11/14 17:08:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.96 2011/11/18 17:32:14 vapier Exp $
# @ECLASS: libtool.eclass
# @MAINTAINER:
@@ -14,12 +14,23 @@
# generated libtool files. We do not run the libtoolize program because that
# requires a regeneration of the main autotool files in order to work properly.
+# If an overlay has eclass overrides, but doesn't actually override the
+# libtool.eclass, we'll have ECLASSDIR pointing to the active overlay's
+# eclass/ dir, but libtool.eclass is still in the main Gentoo tree. So
+# add a check to locate the ELT-patches/ regardless of what's going on.
+ECLASSDIR_LOCAL=${BASH_SOURCE[0]%/*}
+elt_patch_dir() {
+ local d="${ECLASSDIR}/ELT-patches"
+ if [[ ! -d ${d} ]] ; then
+ d="${ECLASSDIR_LOCAL}/ELT-patches"
+ fi
+ echo "${d}"
+}
+
DESCRIPTION="Based on the ${ECLASS} eclass"
inherit multilib toolchain-funcs
-ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
-
#
# See if we can apply $2 on $1, and if so, do it
#
@@ -70,7 +81,7 @@
local ret=1
local file=$1
local patch_set=$2
- local patch_dir="${ELT_PATCH_DIR}/${patch_set}"
+ local patch_dir="$(elt_patch_dir)/${patch_set}"
local rem_int_dep=$3
[[ -z ${patch_set} ]] && return 1
@@ -84,7 +95,7 @@
sed_args+=( -e "s|@REM_INT_DEP@|${rem_int_dep}|g" )
fi
- pushd "${ELT_PATCH_DIR}" >/dev/null || die
+ pushd "$(elt_patch_dir)" >/dev/null || die
# Go through the patches in reverse order (newer version to older)
for patch in $(find "${patch_set}" -maxdepth 1 -type f | LC_ALL=C sort -r) ; do
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2011-12-13 21:28 Mike Frysinger (vapier)
0 siblings, 0 replies; 24+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-13 21:28 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/13 21:28:15
Modified: libtool.eclass
Log:
avoid multiple inclusions when possible to speed caching up
Revision Changes Path
1.97 eclass/libtool.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.96&r2=1.97
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- libtool.eclass 18 Nov 2011 17:32:14 -0000 1.96
+++ libtool.eclass 13 Dec 2011 21:28:15 -0000 1.97
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.96 2011/11/18 17:32:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.97 2011/12/13 21:28:15 vapier Exp $
# @ECLASS: libtool.eclass
# @MAINTAINER:
@@ -14,6 +14,9 @@
# generated libtool files. We do not run the libtoolize program because that
# requires a regeneration of the main autotool files in order to work properly.
+if [[ ${___ECLASS_ONCE_LIBTOOL} != "recur -_+^+_- spank" ]] ; then
+___ECLASS_ONCE_LIBTOOL="recur -_+^+_- spank"
+
# If an overlay has eclass overrides, but doesn't actually override the
# libtool.eclass, we'll have ECLASSDIR pointing to the active overlay's
# eclass/ dir, but libtool.eclass is still in the main Gentoo tree. So
@@ -497,3 +500,5 @@
echo 1
return 1
}
+
+fi
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2011-12-21 21:21 Mike Frysinger (vapier)
0 siblings, 0 replies; 24+ messages in thread
From: Mike Frysinger (vapier) @ 2011-12-21 21:21 UTC (permalink / raw
To: gentoo-commits
vapier 11/12/21 21:21:04
Modified: libtool.eclass
Log:
elibtoolize: make sure header is included in logs too and not just the sub messages which rely on the context #395489 by Martin von Gagern
Revision Changes Path
1.98 eclass/libtool.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.97&r2=1.98
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- libtool.eclass 13 Dec 2011 21:28:15 -0000 1.97
+++ libtool.eclass 21 Dec 2011 21:21:04 -0000 1.98
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.97 2011/12/13 21:28:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.98 2011/12/21 21:21:04 vapier Exp $
# @ECLASS: libtool.eclass
# @MAINTAINER:
@@ -208,8 +208,10 @@
${force} || continue
fi
- einfo "Running elibtoolize in: ${d#${WORKDIR}/}/"
- if [[ -f ${d}/.elibtoolized ]] ; then
+ local outfunc="einfo"
+ [[ -f ${d}/.elibtoolized ]] && outfunc="ewarn"
+ ${outfunc} "Running elibtoolize in: ${d#${WORKDIR}/}/"
+ if [[ ${outfunc} == "ewarn" ]] ; then
ewarn " We've already been run in this tree; you should"
ewarn " avoid this if possible (perhaps by filing a bug)"
fi
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2012-05-06 11:42 Fabian Groffen (grobian)
0 siblings, 0 replies; 24+ messages in thread
From: Fabian Groffen (grobian) @ 2012-05-06 11:42 UTC (permalink / raw
To: gentoo-commits
grobian 12/05/06 11:42:07
Modified: libtool.eclass
Log:
also apply sol2-conf patchset
Revision Changes Path
1.100 eclass/libtool.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.99&r2=1.100
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- libtool.eclass 6 May 2012 10:41:48 -0000 1.99
+++ libtool.eclass 6 May 2012 11:42:07 -0000 1.100
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.99 2012/05/06 10:41:48 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.100 2012/05/06 11:42:07 grobian Exp $
# @ECLASS: libtool.eclass
# @MAINTAINER:
@@ -333,7 +333,7 @@
fi
done
;;
- mint-conf|gold-conf)
+ mint-conf|gold-conf|sol2-conf)
ret=1
local subret=1
if [[ -e ${d}/configure ]]; then
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2013-05-04 5:23 Mike Frysinger (vapier)
0 siblings, 0 replies; 24+ messages in thread
From: Mike Frysinger (vapier) @ 2013-05-04 5:23 UTC (permalink / raw
To: gentoo-commits
vapier 13/05/04 05:23:31
Modified: libtool.eclass
Log:
make sure we save/restore chmod bits in case `patch` is broken and does not do it for us
Revision Changes Path
1.103 eclass/libtool.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.102&r2=1.103
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- libtool.eclass 15 Sep 2012 16:16:53 -0000 1.102
+++ libtool.eclass 4 May 2013 05:23:31 -0000 1.103
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.102 2012/09/15 16:16:53 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.103 2013/05/04 05:23:31 vapier Exp $
# @ECLASS: libtool.eclass
# @MAINTAINER:
@@ -49,6 +49,8 @@
fi
printf '\nTrying %s\n' "${disp}" >> "${log}"
+ # Save file for permission restoration. `patch` sometimes resets things.
+ cp -p "${file}" "${file}.gentoo.elt"
# We only support patchlevel of 0 - why worry if its static patches?
if patch -p0 --dry-run "${file}" "${patch}" >> "${log}" 2>&1 ; then
einfo " Applying ${disp} ..."
@@ -58,6 +60,8 @@
else
ret=1
fi
+ chmod --reference="${file}.gentoo.elt" "${file}"
+ rm -f "${file}.gentoo.elt"
return "${ret}"
}
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2013-05-04 5:24 Mike Frysinger (vapier)
0 siblings, 0 replies; 24+ messages in thread
From: Mike Frysinger (vapier) @ 2013-05-04 5:24 UTC (permalink / raw
To: gentoo-commits
vapier 13/05/04 05:24:05
Modified: libtool.eclass
Log:
apply fix from upstream to use ${CHOST}-nm by default #462976 by Agostino Sarubbo
Revision Changes Path
1.104 eclass/libtool.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.104&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.104&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.103&r2=1.104
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- libtool.eclass 4 May 2013 05:23:31 -0000 1.103
+++ libtool.eclass 4 May 2013 05:24:05 -0000 1.104
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.103 2013/05/04 05:23:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.104 2013/05/04 05:24:05 vapier Exp $
# @ECLASS: libtool.eclass
# @MAINTAINER:
@@ -136,7 +136,7 @@
local deptoremove=
local do_shallow="no"
local force="false"
- local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed"
+ local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed target-nm"
for x in "$@" ; do
case ${x} in
@@ -354,6 +354,10 @@
ret=0
fi
;;
+ target-nm)
+ ELT_walk_patches "${d}/configure" "${p}"
+ ret=$?
+ ;;
install-sh)
ELT_walk_patches "${d}/install-sh" "${p}"
ret=$?
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2013-05-07 14:23 Mike Frysinger (vapier)
0 siblings, 0 replies; 24+ messages in thread
From: Mike Frysinger (vapier) @ 2013-05-07 14:23 UTC (permalink / raw
To: gentoo-commits
vapier 13/05/07 14:23:33
Modified: libtool.eclass
Log:
do not try to cp/patch/chmod the file if it does not exist #468852 by Samuli Suominen
Revision Changes Path
1.105 eclass/libtool.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.105&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.105&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.104&r2=1.105
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- libtool.eclass 4 May 2013 05:24:05 -0000 1.104
+++ libtool.eclass 7 May 2013 14:23:33 -0000 1.105
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.104 2013/05/04 05:24:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.105 2013/05/07 14:23:33 vapier Exp $
# @ECLASS: libtool.eclass
# @MAINTAINER:
@@ -49,6 +49,11 @@
fi
printf '\nTrying %s\n' "${disp}" >> "${log}"
+ if [[ ! -e ${file} ]] ; then
+ echo "File not found: ${file}" >> "${log}"
+ return 1
+ fi
+
# Save file for permission restoration. `patch` sometimes resets things.
cp -p "${file}" "${file}.gentoo.elt"
# We only support patchlevel of 0 - why worry if its static patches?
^ permalink raw reply [flat|nested] 24+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass
@ 2014-01-13 19:49 Mike Frysinger (vapier)
0 siblings, 0 replies; 24+ messages in thread
From: Mike Frysinger (vapier) @ 2014-01-13 19:49 UTC (permalink / raw
To: gentoo-commits
vapier 14/01/13 19:49:25
Modified: libtool.eclass
Log:
namespace ECLASSDIR_LOCAL incase some other eclass tries to use the same var
Revision Changes Path
1.110 eclass/libtool.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.110&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.110&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.109&r2=1.110
Index: libtool.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- libtool.eclass 31 Dec 2013 16:53:05 -0000 1.109
+++ libtool.eclass 13 Jan 2014 19:49:25 -0000 1.110
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.109 2013/12/31 16:53:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.110 2014/01/13 19:49:25 vapier Exp $
# @ECLASS: libtool.eclass
# @MAINTAINER:
@@ -21,11 +21,11 @@
# libtool.eclass, we'll have ECLASSDIR pointing to the active overlay's
# eclass/ dir, but libtool.eclass is still in the main Gentoo tree. So
# add a check to locate the ELT-patches/ regardless of what's going on.
-ECLASSDIR_LOCAL=${BASH_SOURCE[0]%/*}
+_LIBTOOL_ECLASSDIR_LOCAL=${BASH_SOURCE[0]%/*}
elt_patch_dir() {
local d="${ECLASSDIR}/ELT-patches"
if [[ ! -d ${d} ]] ; then
- d="${ECLASSDIR_LOCAL}/ELT-patches"
+ d="${_LIBTOOL_ECLASSDIR_LOCAL}/ELT-patches"
fi
echo "${d}"
}
^ permalink raw reply [flat|nested] 24+ messages in thread
end of thread, other threads:[~2014-01-13 19:49 UTC | newest]
Thread overview: 24+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-06 11:42 [gentoo-commits] gentoo-x86 commit in eclass: libtool.eclass Fabian Groffen (grobian)
-- strict thread matches above, loose matches on Subject: below --
2014-01-13 19:49 Mike Frysinger (vapier)
2013-05-07 14:23 Mike Frysinger (vapier)
2013-05-04 5:24 Mike Frysinger (vapier)
2013-05-04 5:23 Mike Frysinger (vapier)
2011-12-21 21:21 Mike Frysinger (vapier)
2011-12-13 21:28 Mike Frysinger (vapier)
2011-11-18 17:32 Mike Frysinger (vapier)
2011-10-03 4:04 Mike Frysinger (vapier)
2011-06-10 16:17 Diego Petteno (flameeyes)
2011-06-10 10:14 Diego Petteno (flameeyes)
2011-06-09 15:53 Diego Petteno (flameeyes)
2010-08-22 22:44 Mike Frysinger (vapier)
2010-05-11 4:45 Mike Frysinger (vapier)
2010-04-14 18:14 Mike Frysinger (vapier)
2010-04-14 2:13 Mike Frysinger (vapier)
2010-03-12 8:17 Michael Haubenwallner (haubi)
2010-01-27 20:41 Fabian Groffen (grobian)
2009-03-14 13:02 Mike Frysinger (vapier)
2008-07-31 20:01 Samuli Suominen (drac)
2007-09-15 6:55 Roy Marples (uberlord)
2007-09-14 16:25 Roy Marples (uberlord)
2007-09-14 11:38 Roy Marples (uberlord)
2007-09-14 6:49 Roy Marples (uberlord)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox