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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.63  
changed lines
  Added in v.1.105

  ViewVC Help
Powered by ViewVC 1.1.20