/[gentoo-x86]/eclass/libtool.eclass
Gentoo

Diff of /eclass/libtool.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.72 Revision 1.93
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2010 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.72 2006/05/09 17:50:17 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.93 2011/06/10 16:17:57 flameeyes Exp $
4# 4
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# @ECLASS: libtool.eclass
6# 6# @MAINTAINER:
7# base-system@gentoo.org
8# @BLURB: quickly update bundled libtool code
9# @DESCRIPTION:
7# This eclass patches ltmain.sh distributed with libtoolized packages with the 10# This eclass patches ltmain.sh distributed with libtoolized packages with the
8# relink and portage patch among others 11# relink and portage patch among others
9 12#
10 13# Note, this eclass does not require libtool as it only applies patches to
11# 2004.09.25 rac 14# generated libtool files. We do not run the libtoolize program because that
12# i have verified that at least one package can use this eclass and 15# requires a regeneration of the main autotool files in order to work properly.
13# build properly even without libtool installed yet, probably using
14# the files in the distribution. eliminating this dependency fixes
15# bug 65209, which is a showstopper for people doing installs using
16# stageballs <3. if anybody decides to revert this, please attempt
17# to find an alternate way of resolving that bug at the same time.
18 16
19DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
20 18
21ELIBTOOL_VERSION="2.0.2" 19inherit toolchain-funcs
22 20
23ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches" 21ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
24ELT_APPLIED_PATCHES=
25ELT_LTMAIN_SH=
26
27#
28# Returns all the directories containing ltmain.sh
29#
30ELT_find_ltmain_sh() {
31 local x=
32 local dirlist=
33
34 for x in $(find "${S}" -name 'ltmain.sh') ; do
35 dirlist="${dirlist} ${x%/*}"
36 done
37
38 echo "${dirlist}"
39}
40 22
41# 23#
42# See if we can apply $2 on $1, and if so, do it 24# See if we can apply $2 on $1, and if so, do it
43# 25#
44ELT_try_and_apply_patch() { 26ELT_try_and_apply_patch() {
45 local ret=0 27 local ret=0
46 local file=$1 28 local file=$1
47 local patch=$2 29 local patch=$2
48 30
31 echo -e "\nTrying $(basename "$(dirname "${patch}")")-${patch##*/}.patch on ${file}" \
32 >> "${T}/elibtool.log" 2>&1
33
49 # We only support patchlevel of 0 - why worry if its static patches? 34 # We only support patchlevel of 0 - why worry if its static patches?
50 if patch -p0 --dry-run "${file}" "${patch}" &> "${T}/elibtool.log" ; then 35 if patch -p0 --dry-run "${file}" "${patch}" >> "${T}/elibtool.log" 2>&1 ; then
51 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..." 36 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
52 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \ 37 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \
53 &> "${T}/elibtool.log" 38 >> "${T}/elibtool.log" 2>&1
54 ret=$? 39 ret=$?
55 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}" 40 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
56 else 41 else
57 ret=1 42 ret=1
58 fi 43 fi
… …
62 47
63# 48#
64# Get string version of ltmain.sh or ltconfig (passed as $1) 49# Get string version of ltmain.sh or ltconfig (passed as $1)
65# 50#
66ELT_libtool_version() { 51ELT_libtool_version() {
67 local ltmain_sh=$1 52 (
68 local version= 53 unset VERSION
69
70 version=$(eval $(grep -e '^[[:space:]]*VERSION=' "${ltmain_sh}"); \ 54 eval $(grep -e '^[[:space:]]*VERSION=' "$1")
71 echo "${VERSION}") 55 echo "${VERSION:-0}"
72 [[ -z ${version} ]] && version="0" 56 )
73
74 echo "${version}"
75} 57}
76 58
77# 59#
78# Run through the patches in $2 and see if any 60# Run through the patches in $2 and see if any
79# apply to $1 ... 61# apply to $1 ...
80# 62#
81ELT_walk_patches() { 63ELT_walk_patches() {
82 local x= 64 local patch
83 local y=
84 local ret=1 65 local ret=1
85 local file=$1 66 local file=$1
86 local patch_set=$2 67 local patch_set=$2
87 local patch_dir= 68 local patch_dir="${ELT_PATCH_DIR}/${patch_set}"
88 local rem_int_dep=$3 69 local rem_int_dep=$3
89 70
90 if [[ -n ${patch_set} ]] ; then 71 [[ -z ${patch_set} ]] && return 1
91 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then 72 [[ ! -d ${patch_dir} ]] && return 1
92 patch_dir="${ELT_PATCH_DIR}/${patch_set}" 73
93 else 74 pushd "${ELT_PATCH_DIR}" >/dev/null
94 return "${ret}" 75
76 # Go through the patches in reverse order (newer version to older)
77 for patch in $(find "${patch_set}" -maxdepth 1 -type f | LC_ALL=C sort -r) ; do
78 # For --remove-internal-dep ...
79 if [[ -n ${rem_int_dep} ]] ; then
80 # For replace @REM_INT_DEP@ with what was passed
81 # to --remove-internal-dep
82 local tmp="${T}/$$.rem_int_deps.patch"
83 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" "${patch}" > "${tmp}"
84 patch=${tmp}
95 fi 85 fi
96 86
97 # Go through the patches in reverse order (large to small)
98 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | grep -v 'CVS' | sort -r) ; do
99 if [[ -n ${x} && -f ${x} ]] ; then
100 # For --remove-internal-dep ...
101 if [[ -n ${rem_int_dep} ]] ; then
102 # For replace @REM_INT_DEP@ with what was passed
103 # to --remove-internal-dep
104 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
105 "${T}/$$.rem_int_deps.patch"
106
107 x="${T}/$$.rem_int_deps.patch"
108 fi
109
110 if ELT_try_and_apply_patch "${file}" "${x}" ; then 87 if ELT_try_and_apply_patch "${file}" "${patch}" ; then
88 # Break to unwind w/popd rather than return directly
111 ret=0 89 ret=0
112 break 90 break
113 fi
114 fi 91 fi
115 done 92 done
116 fi
117 93
94 popd >/dev/null
118 return "${ret}" 95 return ${ret}
119} 96}
120 97
98# @FUNCTION: elibtoolize
99# @USAGE: [dirs] [--portage] [--reverse-deps] [--patch-only] [--remove-internal-dep=xxx] [--shallow] [--no-uclibc]
100# @DESCRIPTION:
101# Apply a smorgasbord of patches to bundled libtool files. This function
102# should always be safe to run. If no directories are specified, then
103# ${S} will be searched for appropriate files.
104#
105# If the --shallow option is used, then only ${S}/ltmain.sh will be patched.
106#
107# The other options should be avoided in general unless you know what's going on.
121elibtoolize() { 108elibtoolize() {
122 local x= 109 local x
123 local y=
124 local do_portage="no" 110 local do_portage="no"
125 local do_reversedeps="no" 111 local do_reversedeps="no"
126 local do_only_patches="no" 112 local do_only_patches="no"
127 local do_uclibc="yes" 113 local do_uclibc="yes"
128 local deptoremove= 114 local deptoremove=
129 local my_dirlist= 115 local do_shallow="no"
130 local elt_patches="portage relink max_cmd_len sed test tmp" 116 local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed"
131 local start_dir=${PWD}
132
133 my_dirlist=$(ELT_find_ltmain_sh)
134 117
135 for x in "$@" ; do 118 for x in "$@" ; do
136 case "${x}" in 119 case ${x} in
137 "--portage") 120 --portage)
138 # Only apply portage patch, and don't 121 # Only apply portage patch, and don't
139 # 'libtoolize --copy --force' if all patches fail. 122 # 'libtoolize --copy --force' if all patches fail.
140 do_portage="yes" 123 do_portage="yes"
141 ;; 124 ;;
142 "--reverse-deps") 125 --reverse-deps)
143 # Apply the reverse-deps patch 126 # Apply the reverse-deps patch
144 # http://bugzilla.gnome.org/show_bug.cgi?id=75635 127 # http://bugzilla.gnome.org/show_bug.cgi?id=75635
145 do_reversedeps="yes" 128 do_reversedeps="yes"
146 elt_patches="${elt_patches} fix-relink" 129 elt_patches+=" fix-relink"
147 ;; 130 ;;
148 "--patch-only") 131 --patch-only)
149 # Do not run libtoolize if none of the patches apply .. 132 # Do not run libtoolize if none of the patches apply ..
150 do_only_patches="yes" 133 do_only_patches="yes"
151 ;; 134 ;;
152 "^--remove-internal-dep="*) 135 --remove-internal-dep=*)
153 # We will replace @REM_INT_DEP@ with what is needed 136 # We will replace @REM_INT_DEP@ with what is needed
154 # in ELT_walk_patches() ... 137 # in ELT_walk_patches() ...
155 deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||') 138 deptoremove=${x#--remove-internal-dep=}
156 139
157 # Add the patch for this ... 140 # Add the patch for this ...
158 [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep" 141 [[ -n ${deptoremove} ]] && elt_patches+=" rem-int-dep"
159 ;; 142 ;;
160 "--shallow") 143 --shallow)
161 # Only patch the ltmain.sh in ${S} 144 # Only patch the ltmain.sh in ${S}
162 if [[ -f ${S}/ltmain.sh ]] ; then 145 do_shallow="yes"
163 my_dirlist=${S}
164 else
165 my_dirlist=
166 fi
167 ;; 146 ;;
168 "--no-uclibc") 147 --no-uclibc)
169 do_uclibc="no" 148 do_uclibc="no"
170 ;; 149 ;;
171 *) 150 *)
172 eerror "Invalid elibtoolize option: ${x}" 151 eerror "Invalid elibtoolize option: ${x}"
173 die "elibtoolize called with ${x} ??" 152 die "elibtoolize called with ${x} ??"
174 esac 153 esac
175 done 154 done
176 155
177 [[ ${do_uclibc} == "yes" ]] && \ 156 [[ ${do_uclibc} == "yes" ]] && elt_patches+=" uclibc-conf uclibc-ltconf"
178 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
179 157
180 [[ ${CHOST} == *"-freebsd"* ]] && \ 158 case ${CHOST} in
181 elt_patches="${elt_patches} fbsd-conf fbsd-ltconf" 159 *-aix*) elt_patches+=" hardcode aixrtl aix-noundef" ;; #213277
160 *-darwin*) elt_patches+=" darwin-ltconf darwin-ltmain darwin-conf" ;;
161 *-freebsd*) elt_patches+=" fbsd-conf fbsd-ltconf" ;;
162 *-hpux*) elt_patches+=" hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc" ;;
163 *-irix*) elt_patches+=" irix-ltmain" ;;
164 *-mint*) elt_patches+=" mint-conf" ;;
165 esac
182 166
183 if useq ppc-macos ; then 167 if $(tc-getLD) --version 2>&1 | grep -qs 'GNU gold'; then
184 local opts 168 elt_patches+=" gold-conf"
185 [[ -f Makefile.am ]] && opts="--automake"
186 glibtoolize --copy --force ${opts}
187
188 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
189 fi 169 fi
190 170
191 for x in ${my_dirlist} ; do 171 # Reuse "$@" for dirs to patch
192 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||") 172 set --
173 if [[ ${do_shallow} == "yes" ]] ; then
174 [[ -f ${S}/ltmain.sh ]] && set -- "${S}"
175 else
176 set -- $(find "${S}" -name ltmain.sh -printf '%h ')
177 fi
178
179 local d p
180 for d in "$@" ; do
193 export ELT_APPLIED_PATCHES= 181 export ELT_APPLIED_PATCHES=
194 export ELT_LTMAIN_SH="${x}/ltmain.sh"
195 182
196 [[ -f ${x}/.elibtoolized ]] && continue 183 [[ -f ${d}/.elibtoolized ]] && continue
197 184
198 cd ${x} 185 einfo "Running elibtoolize in: ${d#${WORKDIR}/}/"
199 einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
200 186
201 for y in ${elt_patches} ; do 187 for p in ${elt_patches} ; do
202 local ret=0 188 local ret=0
203 189
204 case "${y}" in 190 case ${p} in
205 "portage") 191 portage)
206 # Stupid test to see if its already applied ... 192 # Stupid test to see if its already applied ...
207 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 193 if ! grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then
208 ELT_walk_patches "${x}/ltmain.sh" "${y}" 194 ELT_walk_patches "${d}/ltmain.sh" "${p}"
209 ret=$? 195 ret=$?
210 fi 196 fi
211 ;; 197 ;;
212 "rem-int-dep") 198 rem-int-dep)
213 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 199 ELT_walk_patches "${d}/ltmain.sh" "${p}" "${deptoremove}"
214 ret=$? 200 ret=$?
215 ;; 201 ;;
216 "fix-relink") 202 fix-relink)
217 # Do not apply if we do not have the relink patch applied ... 203 # Do not apply if we do not have the relink patch applied ...
218 if [[ -n $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then 204 if grep -qs 'inst_prefix_dir' "${d}/ltmain.sh" ; then
219 ELT_walk_patches "${x}/ltmain.sh" "${y}" 205 ELT_walk_patches "${d}/ltmain.sh" "${p}"
220 ret=$? 206 ret=$?
221 fi 207 fi
222 ;; 208 ;;
223 "max_cmd_len") 209 max_cmd_len)
224 # Do not apply if $max_cmd_len is not used ... 210 # Do not apply if $max_cmd_len is not used ...
225 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then 211 if grep -qs 'max_cmd_len' "${d}/ltmain.sh" ; then
226 ELT_walk_patches "${x}/ltmain.sh" "${y}" 212 ELT_walk_patches "${d}/ltmain.sh" "${p}"
213 ret=$?
214 fi
215 ;;
216 as-needed)
217 ELT_walk_patches "${d}/ltmain.sh" "${p}"
227 ret=$? 218 ret=$?
228 fi
229 ;; 219 ;;
230 "uclibc-conf") 220 uclibc-conf)
231 if [[ -e ${x}/configure && \
232 -n $(grep 'Transform linux' "${x}/configure") ]] ; then 221 if grep -qs 'Transform linux' "${d}/configure" ; then
233 ELT_walk_patches "${x}/configure" "${y}" 222 ELT_walk_patches "${d}/configure" "${p}"
234 ret=$? 223 ret=$?
235 # ltmain.sh and co might be in a subdirectory ... 224 # ltmain.sh and co might be in a subdirectory ...
236 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \ 225 elif [[ ! -e ${d}/configure ]] && \
237 -n $(grep 'Transform linux' "${x}/../configure") ]] ; then 226 grep -qs 'Transform linux' "${d}/../configure" ; then
238 ELT_walk_patches "${x}/../configure" "${y}" 227 ELT_walk_patches "${d}/../configure" "${p}"
239 ret=$? 228 ret=$?
240 fi 229 fi
241 ;; 230 ;;
242 "uclibc-ltconf") 231 uclibc-ltconf)
243 # Newer libtoolize clears ltconfig, as not used anymore 232 # Newer libtoolize clears ltconfig, as not used anymore
244 if [[ -s ${x}/ltconfig ]] ; then 233 if [[ -s ${d}/ltconfig ]] ; then
245 ELT_walk_patches "${x}/ltconfig" "${y}" 234 ELT_walk_patches "${d}/ltconfig" "${p}"
246 ret=$? 235 ret=$?
247 fi 236 fi
248 ;; 237 ;;
249 "fbsd-conf") 238 fbsd-conf)
250 if [[ -e ${x}/configure && \
251 -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then 239 if grep -qs 'version_type=freebsd-' "${d}/configure" ; then
252 ELT_walk_patches "${x}/configure" "${y}" 240 ELT_walk_patches "${d}/configure" "${p}"
253 ret=$? 241 ret=$?
254 # ltmain.sh and co might be in a subdirectory ... 242 # ltmain.sh and co might be in a subdirectory ...
255 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \ 243 elif [[ ! -e ${d}/configure ]] && \
256 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then 244 grep -qs 'version_type=freebsd-' "${d}/../configure" ; then
257 ELT_walk_patches "${x}/../configure" "${y}" 245 ELT_walk_patches "${d}/../configure" "${p}"
258 ret=$? 246 ret=$?
259 fi 247 fi
260 ;; 248 ;;
261 "fbsd-ltconf") 249 fbsd-ltconf)
262 if [[ -s ${x}/ltconfig ]] ; then 250 if [[ -s ${d}/ltconfig ]] ; then
263 ELT_walk_patches "${x}/ltconfig" "${y}" 251 ELT_walk_patches "${d}/ltconfig" "${p}"
264 ret=$? 252 ret=$?
265 fi 253 fi
266 ;; 254 ;;
255 darwin-conf)
256 if grep -qs '&& echo \.so ||' "${d}/configure" ; then
257 ELT_walk_patches "${d}/configure" "${p}"
258 ret=$?
259 # ltmain.sh and co might be in a subdirectory ...
260 elif [[ ! -e ${d}/configure ]] && \
261 grep -qs '&& echo \.so ||' "${d}/../configure" ; then
262 ELT_walk_patches "${d}/../configure" "${p}"
263 ret=$?
264 fi
265 ;;
267 "darwin-ltconf") 266 darwin-ltconf)
268 # Newer libtoolize clears ltconfig, as not used anymore 267 # Newer libtoolize clears ltconfig, as not used anymore
269 if [[ -s ${x}/ltconfig ]] ; then 268 if [[ -s ${d}/ltconfig ]] ; then
270 ELT_walk_patches "${x}/ltconfig" "${y}" 269 ELT_walk_patches "${d}/ltconfig" "${p}"
270 ret=$?
271 fi
272 ;;
273 darwin-ltmain)
274 # special case to avoid false positives (failing to apply
275 # ltmain.sh path message), newer libtools have this patch
276 # built in, so not much to patch around then
277 if [[ -e ${d}/ltmain.sh ]] && \
278 ! grep -qs 'verstring="-compatibility_version' "${d}/ltmain.sh" ; then
279 ELT_walk_patches "${d}/ltmain.sh" "${p}"
280 ret=$?
281 fi
282 ;;
283 aixrtl|hpux-conf)
284 ret=1
285 local subret=0
286 # apply multiple patches as often as they match
287 while [[ $subret -eq 0 ]]; do
288 subret=1
289 if [[ -e ${d}/configure ]]; then
290 ELT_walk_patches "${d}/configure" "${p}"
291 subret=$?
292 # ltmain.sh and co might be in a subdirectory ...
293 elif [[ ! -e ${d}/configure && -e ${d}/../configure ]] ; then
294 ELT_walk_patches "${d}/../configure" "${p}"
295 subret=$?
296 fi
297 if [[ $subret -eq 0 ]]; then
298 # have at least one patch succeeded.
299 ret=0
300 fi
301 done
302 ;;
303 mint-conf|gold-conf)
304 ret=1
305 local subret=1
306 if [[ -e ${d}/configure ]]; then
307 ELT_walk_patches "${d}/configure" "${p}"
308 subret=$?
309 # ltmain.sh and co might be in a subdirectory ...
310 elif [[ -e ${d}/../configure ]] ; then
311 ELT_walk_patches "${d}/../configure" "${p}"
312 subret=$?
313 elif [[ -e ${d}/../../configure ]] ; then
314 ELT_walk_patches "${d}/../../configure" "${p}"
315 subret=$?
316 fi
317 if [[ $subret -eq 0 ]]; then
318 # have at least one patch succeeded.
319 ret=0
320 fi
321 ;;
322 install-sh)
323 ELT_walk_patches "${d}/install-sh" "${p}"
324 ret=$?
325 ;;
326 cross)
327 if tc-is-cross-compiler ; then
328 ELT_walk_patches "${d}/ltmain.sh" "${p}"
271 ret=$? 329 ret=$?
272 fi 330 fi
273 ;; 331 ;;
274 *) 332 *)
275 ELT_walk_patches "${x}/ltmain.sh" "${y}" 333 ELT_walk_patches "${d}/ltmain.sh" "${p}"
276 ret=$? 334 ret=$?
277 ;; 335 ;;
278 esac 336 esac
279 337
280 if [[ ${ret} -ne 0 ]] ; then 338 if [[ ${ret} -ne 0 ]] ; then
281 case ${y} in 339 case ${p} in
282 "relink") 340 relink)
283 local version=$(ELT_libtool_version "${x}/ltmain.sh") 341 local version=$(ELT_libtool_version "${d}/ltmain.sh")
284 # Critical patch, but could be applied ... 342 # Critical patch, but could be applied ...
285 # FIXME: Still need a patch for ltmain.sh > 1.4.0 343 # FIXME: Still need a patch for ltmain.sh > 1.4.0
286 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \ 344 if ! grep -qs 'inst_prefix_dir' "${d}/ltmain.sh" && \
287 $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then 345 [[ $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
288 ewarn " Could not apply relink.patch!" 346 ewarn " Could not apply relink.patch!"
289 fi 347 fi
290 ;; 348 ;;
291 "portage") 349 portage)
292 # Critical patch - for this one we abort, as it can really 350 # Critical patch - for this one we abort, as it can really
293 # cause breakage without it applied! 351 # cause breakage without it applied!
294 if [[ ${do_portage} == "yes" ]] ; then 352 if [[ ${do_portage} == "yes" ]] ; then
295 # Stupid test to see if its already applied ... 353 # Stupid test to see if its already applied ...
296 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 354 if ! grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then
297 echo 355 echo
298 eerror "Portage patch requested, but failed to apply!" 356 eerror "Portage patch requested, but failed to apply!"
299 eerror "Please bug azarah or vapier to add proper patch." 357 eerror "Please file a bug report to add a proper patch."
300 die "Portage patch requested, but failed to apply!" 358 die "Portage patch requested, but failed to apply!"
301 fi 359 fi
302 else 360 else
303 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 361 if grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then
304 # ewarn " Portage patch seems to be already applied." 362 # ewarn " Portage patch seems to be already applied."
305 # ewarn " Please verify that it is not needed." 363 # ewarn " Please verify that it is not needed."
306 : 364 :
307 else 365 else
308 local version=$( \ 366 local version=$(ELT_libtool_version "${d}"/ltmain.sh)
309 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
310 echo "${VERSION}")
311
312 echo 367 echo
313 eerror "Portage patch failed to apply (ltmain.sh version ${version})!" 368 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
314 eerror "Please bug azarah or vapier to add proper patch." 369 eerror "Please file a bug report to add a proper patch."
315 die "Portage patch failed to apply!" 370 die "Portage patch failed to apply!"
316 fi 371 fi
317 # We do not want to run libtoolize ... 372 # We do not want to run libtoolize ...
318 ELT_APPLIED_PATCHES="portage" 373 ELT_APPLIED_PATCHES="portage"
319 fi 374 fi
320 ;; 375 ;;
321 "uclibc-"*) 376 uclibc-*)
322 [[ ${CHOST} == *"-uclibc" ]] && \
323 ewarn " uClibc patch set '${y}' failed to apply!" 377 [[ ${CHOST} == *-uclibc ]] && ewarn " uClibc patch set '${p}' failed to apply!"
324 ;; 378 ;;
325 "fbsd-"*) 379 fbsd-*)
326 if [[ ${CHOST} == *"-freebsd"* ]] ; then 380 if [[ ${CHOST} == *-freebsd* ]] ; then
327 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \ 381 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
328 "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then 382 "${d}/configure" "${d}/../configure" 2>/dev/null) ]]; then
329 eerror " FreeBSD patch set '${y}' failed to apply!" 383 eerror " FreeBSD patch set '${p}' failed to apply!"
330 die "FreeBSD patch set '${y}' failed to apply!" 384 die "FreeBSD patch set '${p}' failed to apply!"
331 fi 385 fi
332 fi 386 fi
333 ;; 387 ;;
334 "darwin-"*) 388 darwin-*)
335 useq ppc-macos && \
336 ewarn " Darwin patch set '${y}' failed to apply!" 389 [[ ${CHOST} == *"-darwin"* ]] && ewarn " Darwin patch set '${p}' failed to apply!"
337 ;; 390 ;;
338 esac 391 esac
339 fi 392 fi
340 done 393 done
341 394
… …
344 ${do_reversedeps} == "no" && \ 397 ${do_reversedeps} == "no" && \
345 ${do_only_patches} == "no" && \ 398 ${do_only_patches} == "no" && \
346 ${deptoremove} == "" ]] 399 ${deptoremove} == "" ]]
347 then 400 then
348 ewarn "Cannot apply any patches, please file a bug about this" 401 ewarn "Cannot apply any patches, please file a bug about this"
349 break
350
351 # Sometimes ltmain.sh is in a subdirectory ...
352 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
353 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
354 cd "${x}"/../
355 fi
356 fi 402 die
357
358 if type -p libtoolize &> /dev/null ; then
359 ewarn "Cannot apply any patches, running libtoolize..."
360 libtoolize --copy --force
361 fi
362 cd "${x}"
363 break
364 fi 403 fi
365 fi 404 fi
366 405
367 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool" 406 rm -f "${d}/libtool"
368 407
369 touch "${x}/.elibtoolized" 408 > "${d}/.elibtoolized"
370 done 409 done
371
372 cd "${start_dir}"
373} 410}
374 411
375uclibctoolize() { 412uclibctoolize() { die "Use elibtoolize"; }
376 ewarn "uclibctoolize() is depreciated, please just use elibtoolize()!" 413darwintoolize() { die "Use elibtoolize"; }
377 elibtoolize
378}
379
380darwintoolize() {
381 ewarn "darwintoolize() is depreciated, please just use elibtoolize()!"
382 elibtoolize
383}
384 414
385# char *VER_major(string) 415# char *VER_major(string)
386# 416#
387# Return the Major (X of X.Y.Z) version 417# Return the Major (X of X.Y.Z) version
388# 418#
Legend:
Removed from v.1.72  
changed lines
  Added in v.1.93
  ViewVC Help
Powered by ViewVC 1.1.13