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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.62  
changed lines
  Added in v.1.100

  ViewVC Help
Powered by ViewVC 1.1.20