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

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

  ViewVC Help
Powered by ViewVC 1.1.20