| 1 |
vapier 13/12/31 16:53:05 |
| 2 |
|
| 3 |
Modified: libtool.eclass autotools.eclass |
| 4 |
Log: |
| 5 |
elibtoolize: accept explicit dir args on command line #496320 by Arfrever Frehtes Taifersar Arahesis |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.109 eclass/libtool.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.109&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?rev=1.109&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/libtool.eclass?r1=1.108&r2=1.109 |
| 13 |
|
| 14 |
Index: libtool.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v |
| 17 |
retrieving revision 1.108 |
| 18 |
retrieving revision 1.109 |
| 19 |
diff -u -r1.108 -r1.109 |
| 20 |
--- libtool.eclass 5 Dec 2013 16:52:35 -0000 1.108 |
| 21 |
+++ libtool.eclass 31 Dec 2013 16:53:05 -0000 1.109 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2013 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.108 2013/12/05 16:52:35 blueness Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.109 2013/12/31 16:53:05 vapier Exp $ |
| 27 |
|
| 28 |
# @ECLASS: libtool.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -135,6 +135,7 @@ |
| 31 |
# The other options should be avoided in general unless you know what's going on. |
| 32 |
elibtoolize() { |
| 33 |
local x |
| 34 |
+ local dirs=() |
| 35 |
local do_portage="no" |
| 36 |
local do_reversedeps="no" |
| 37 |
local do_only_patches="no" |
| 38 |
@@ -179,9 +180,11 @@ |
| 39 |
--force) |
| 40 |
force="true" |
| 41 |
;; |
| 42 |
- *) |
| 43 |
+ -*) |
| 44 |
eerror "Invalid elibtoolize option: ${x}" |
| 45 |
die "elibtoolize called with ${x} ??" |
| 46 |
+ ;; |
| 47 |
+ *) dirs+=( "${x}" ) |
| 48 |
esac |
| 49 |
done |
| 50 |
|
| 51 |
@@ -201,16 +204,17 @@ |
| 52 |
elt_patches+=" gold-conf" |
| 53 |
fi |
| 54 |
|
| 55 |
- # Reuse "$@" for dirs to patch |
| 56 |
- set -- |
| 57 |
+ # Find out what dirs to scan. |
| 58 |
if [[ ${do_shallow} == "yes" ]] ; then |
| 59 |
- [[ -f ${S}/ltmain.sh || -f ${S}/configure ]] && set -- "${S}" |
| 60 |
+ [[ ${#dirs[@]} -ne 0 ]] && die "Using --shallow with explicit dirs doesn't make sense" |
| 61 |
+ [[ -f ${S}/ltmain.sh || -f ${S}/configure ]] && dirs+=( "${S}" ) |
| 62 |
else |
| 63 |
- set -- $(find "${S}" '(' -name ltmain.sh -o -name configure ')' -printf '%h\n' | sort -u) |
| 64 |
+ [[ ${#dirs[@]} -eq 0 ]] && dirs+=( "${S}" ) |
| 65 |
+ dirs=( $(find "${dirs[@]}" '(' -name ltmain.sh -o -name configure ')' -printf '%h\n' | sort -u) ) |
| 66 |
fi |
| 67 |
|
| 68 |
- local d p |
| 69 |
- for d in "$@" ; do |
| 70 |
+ local d p ret |
| 71 |
+ for d in "${dirs[@]}" ; do |
| 72 |
export ELT_APPLIED_PATCHES= |
| 73 |
|
| 74 |
if [[ -f ${d}/.elibtoolized ]] ; then |
| 75 |
@@ -225,8 +229,6 @@ |
| 76 |
ewarn " avoid this if possible (perhaps by filing a bug)" |
| 77 |
fi |
| 78 |
|
| 79 |
- local ret |
| 80 |
- |
| 81 |
# patching ltmain.sh |
| 82 |
[[ -f ${d}/ltmain.sh ]] && |
| 83 |
for p in ${elt_patches} ; do |
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
1.159 eclass/autotools.eclass |
| 88 |
|
| 89 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.159&view=markup |
| 90 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.159&content-type=text/plain |
| 91 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.158&r2=1.159 |
| 92 |
|
| 93 |
Index: autotools.eclass |
| 94 |
=================================================================== |
| 95 |
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v |
| 96 |
retrieving revision 1.158 |
| 97 |
retrieving revision 1.159 |
| 98 |
diff -u -r1.158 -r1.159 |
| 99 |
--- autotools.eclass 30 Dec 2013 08:19:02 -0000 1.158 |
| 100 |
+++ autotools.eclass 31 Dec 2013 16:53:05 -0000 1.159 |
| 101 |
@@ -1,6 +1,6 @@ |
| 102 |
# Copyright 1999-2013 Gentoo Foundation |
| 103 |
# Distributed under the terms of the GNU General Public License v2 |
| 104 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.158 2013/12/30 08:19:02 vapier Exp $ |
| 105 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.159 2013/12/31 16:53:05 vapier Exp $ |
| 106 |
|
| 107 |
# @ECLASS: autotools.eclass |
| 108 |
# @MAINTAINER: |
| 109 |
@@ -221,8 +221,8 @@ |
| 110 |
|
| 111 |
if [[ ${AT_NOELIBTOOLIZE} != "yes" ]] ; then |
| 112 |
# Call it here to prevent failures due to elibtoolize called _before_ |
| 113 |
- # eautoreconf. We set $S because elibtoolize runs on that #265319 |
| 114 |
- S=${PWD} elibtoolize --force |
| 115 |
+ # eautoreconf. |
| 116 |
+ elibtoolize --force "${PWD}" |
| 117 |
fi |
| 118 |
|
| 119 |
if [[ -n ${multitop} ]] ; then |
Archives