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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.59  
changed lines
  Added in v.1.97

  ViewVC Help
Powered by ViewVC 1.1.20