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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.1.1.1  
changed lines
  Added in v.1.102

  ViewVC Help
Powered by ViewVC 1.1.20