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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.62  
changed lines
  Added in v.1.96

  ViewVC Help
Powered by ViewVC 1.1.20