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

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

  ViewVC Help
Powered by ViewVC 1.1.20