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

Diff of /eclass/libtool.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20