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

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

  ViewVC Help
Powered by ViewVC 1.1.20