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

Legend:
Removed from v.1.72  
changed lines
  Added in v.1.106

  ViewVC Help
Powered by ViewVC 1.1.20