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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.53  
changed lines
  Added in v.1.105

  ViewVC Help
Powered by ViewVC 1.1.20