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

Diff of /eclass/libtool.eclass

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

Revision 1.83 Revision 1.102
1# Copyright 1999-2007 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.83 2009/05/03 20:03:10 loki_val Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.102 2012/09/15 16:16:53 zmedico Exp $
4# 4
5# @ECLASS: libtool.eclass
6# @MAINTAINER:
5# Maintainer: base-system@gentoo.org 7# base-system@gentoo.org
6# 8# @BLURB: quickly update bundled libtool code
9# @DESCRIPTION:
7# This eclass patches ltmain.sh distributed with libtoolized packages with the 10# This eclass patches ltmain.sh distributed with libtoolized packages with the
8# relink and portage patch among others 11# relink and portage patch among others
9# 12#
10# Note, this eclass does not require libtool as it only applies patches to 13# Note, this eclass does not require libtool as it only applies patches to
11# generated libtool files. We do not run the libtoolize program because that 14# generated libtool files. We do not run the libtoolize program because that
12# requires a regeneration of the main autotool files in order to work properly. 15# requires a regeneration of the main autotool files in order to work properly.
13 16
14DESCRIPTION="Based on the ${ECLASS} eclass" 17if [[ ${___ECLASS_ONCE_LIBTOOL} != "recur -_+^+_- spank" ]] ; then
18___ECLASS_ONCE_LIBTOOL="recur -_+^+_- spank"
15 19
16ELIBTOOL_VERSION="2.0.2" 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
30 echo "${d}"
31}
17 32
18inherit toolchain-funcs 33inherit multilib toolchain-funcs
19
20ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
21ELT_APPLIED_PATCHES=
22ELT_LTMAIN_SH=
23
24#
25# Returns all the directories containing ltmain.sh
26#
27ELT_find_ltmain_sh() {
28 local x=
29 local dirlist=
30
31 for x in $(find "${S}" -name 'ltmain.sh') ; do
32 dirlist="${dirlist} ${x%/*}"
33 done
34
35 echo "${dirlist}"
36}
37 34
38# 35#
39# 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
40# 37#
41ELT_try_and_apply_patch() { 38ELT_try_and_apply_patch() {
42 local ret=0 39 local ret=0
43 local file=$1 40 local file=$1
44 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}"
45 51
46 # 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?
47 if patch -p0 --dry-run "${file}" "${patch}" &> "${T}/elibtool.log" ; then 53 if patch -p0 --dry-run "${file}" "${patch}" >> "${log}" 2>&1 ; then
48 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..." 54 einfo " Applying ${disp} ..."
49 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \ 55 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" >> "${log}" 2>&1
50 &> "${T}/elibtool.log"
51 ret=$? 56 ret=$?
52 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}" 57 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${src}"
53 else 58 else
54 ret=1 59 ret=1
55 fi 60 fi
56 61
57 return "${ret}" 62 return "${ret}"
59 64
60# 65#
61# Get string version of ltmain.sh or ltconfig (passed as $1) 66# Get string version of ltmain.sh or ltconfig (passed as $1)
62# 67#
63ELT_libtool_version() { 68ELT_libtool_version() {
64 local ltmain_sh=$1 69 (
65 local version= 70 unset VERSION
66
67 version=$(eval $(grep -e '^[[:space:]]*VERSION=' "${ltmain_sh}"); \ 71 eval $(grep -e '^[[:space:]]*VERSION=' "$1")
68 echo "${VERSION}") 72 echo "${VERSION:-0}"
69 [[ -z ${version} ]] && version="0" 73 )
70
71 echo "${version}"
72} 74}
73 75
74# 76#
75# Run through the patches in $2 and see if any 77# Run through the patches in $2 and see if any
76# apply to $1 ... 78# apply to $1 ...
77# 79#
78ELT_walk_patches() { 80ELT_walk_patches() {
79 local x= 81 local patch tmp
80 local y=
81 local ret=1 82 local ret=1
82 local file=$1 83 local file=$1
83 local patch_set=$2 84 local patch_set=$2
84 local patch_dir= 85 local patch_dir="$(elt_patch_dir)/${patch_set}"
85 local rem_int_dep=$3 86 local rem_int_dep=$3
86 87
87 if [[ -n ${patch_set} ]] ; then 88 [[ -z ${patch_set} ]] && return 1
88 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then 89 [[ ! -d ${patch_dir} ]] && return 1
89 patch_dir="${ELT_PATCH_DIR}/${patch_set}" 90
90 else 91 # Allow patches to use @GENTOO_LIBDIR@ replacements
91 return "${ret}" 92 local sed_args=( -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" )
93 if [[ -n ${rem_int_dep} ]] ; then
94 # replace @REM_INT_DEP@ with what was passed
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
92 fi 109 fi
93
94 # Go through the patches in reverse order (large to small)
95 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | grep -v 'CVS' | sort -r) ; do
96 if [[ -n ${x} && -f ${x} ]] ; then
97 # For --remove-internal-dep ...
98 if [[ -n ${rem_int_dep} ]] ; then
99 # For replace @REM_INT_DEP@ with what was passed
100 # to --remove-internal-dep
101 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|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 "${file}" "${x}" ; then
108 ret=0
109 break
110 fi
111 fi
112 done 110 done
113 fi
114 111
112 popd >/dev/null
115 return "${ret}" 113 return ${ret}
116} 114}
117 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.
118elibtoolize() { 126elibtoolize() {
119 local x= 127 local x
120 local y=
121 local do_portage="no" 128 local do_portage="no"
122 local do_reversedeps="no" 129 local do_reversedeps="no"
123 local do_only_patches="no" 130 local do_only_patches="no"
124 local do_uclibc="yes" 131 local do_uclibc="yes"
125 local deptoremove= 132 local deptoremove=
126 local my_dirlist= 133 local do_shallow="no"
134 local force="false"
127 local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed" 135 local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed"
128 local start_dir=${PWD}
129
130 my_dirlist=$(ELT_find_ltmain_sh)
131 136
132 for x in "$@" ; do 137 for x in "$@" ; do
133 case "${x}" in 138 case ${x} in
134 "--portage") 139 --portage)
135 # Only apply portage patch, and don't 140 # Only apply portage patch, and don't
136 # 'libtoolize --copy --force' if all patches fail. 141 # 'libtoolize --copy --force' if all patches fail.
137 do_portage="yes" 142 do_portage="yes"
138 ;; 143 ;;
139 "--reverse-deps") 144 --reverse-deps)
140 # Apply the reverse-deps patch 145 # Apply the reverse-deps patch
141 # http://bugzilla.gnome.org/show_bug.cgi?id=75635 146 # http://bugzilla.gnome.org/show_bug.cgi?id=75635
142 do_reversedeps="yes" 147 do_reversedeps="yes"
143 elt_patches="${elt_patches} fix-relink" 148 elt_patches+=" fix-relink"
144 ;; 149 ;;
145 "--patch-only") 150 --patch-only)
146 # Do not run libtoolize if none of the patches apply .. 151 # Do not run libtoolize if none of the patches apply ..
147 do_only_patches="yes" 152 do_only_patches="yes"
148 ;; 153 ;;
149 "^--remove-internal-dep="*) 154 --remove-internal-dep=*)
150 # We will replace @REM_INT_DEP@ with what is needed 155 # We will replace @REM_INT_DEP@ with what is needed
151 # in ELT_walk_patches() ... 156 # in ELT_walk_patches() ...
152 deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||') 157 deptoremove=${x#--remove-internal-dep=}
153 158
154 # Add the patch for this ... 159 # Add the patch for this ...
155 [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep" 160 [[ -n ${deptoremove} ]] && elt_patches+=" rem-int-dep"
156 ;; 161 ;;
157 "--shallow") 162 --shallow)
158 # Only patch the ltmain.sh in ${S} 163 # Only patch the ltmain.sh in ${S}
159 if [[ -f ${S}/ltmain.sh ]] ; then 164 do_shallow="yes"
160 my_dirlist=${S}
161 else
162 my_dirlist=
163 fi
164 ;; 165 ;;
165 "--no-uclibc") 166 --no-uclibc)
166 do_uclibc="no" 167 do_uclibc="no"
168 ;;
169 --force)
170 force="true"
167 ;; 171 ;;
168 *) 172 *)
169 eerror "Invalid elibtoolize option: ${x}" 173 eerror "Invalid elibtoolize option: ${x}"
170 die "elibtoolize called with ${x} ??" 174 die "elibtoolize called with ${x} ??"
171 esac 175 esac
172 done 176 done
173 177
174 [[ ${do_uclibc} == "yes" ]] && \ 178 [[ ${do_uclibc} == "yes" ]] && elt_patches+=" uclibc-conf uclibc-ltconf"
175 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
176 179
177 [[ ${CHOST} == *"-freebsd"* ]] && \ 180 case ${CHOST} in
178 elt_patches="${elt_patches} fbsd-conf fbsd-ltconf" 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
179 189
180 [[ ${CHOST} == *"-darwin"* ]] && \ 190 if $(tc-getLD) --version 2>&1 | grep -qs 'GNU gold'; then
181 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain" 191 elt_patches+=" gold-conf"
192 fi
182 193
183 for x in ${my_dirlist} ; do 194 # Reuse "$@" for dirs to patch
184 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
185 export ELT_APPLIED_PATCHES= 204 export ELT_APPLIED_PATCHES=
186 export ELT_LTMAIN_SH="${x}/ltmain.sh"
187 205
206 if [[ -f ${d}/.elibtoolized ]] ; then
207 ${force} || continue
208 fi
209
210 local outfunc="einfo"
188 [[ -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
189 217
190 cd ${x}
191 einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
192
193 for y in ${elt_patches} ; do 218 for p in ${elt_patches} ; do
194 local ret=0 219 local ret=0
195 220
196 case "${y}" in 221 case ${p} in
197 "portage") 222 portage)
198 # Stupid test to see if its already applied ... 223 # Stupid test to see if its already applied ...
199 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 224 if ! grep -qs 'We do not want portage' "${d}/ltmain.sh" ; then
200 ELT_walk_patches "${x}/ltmain.sh" "${y}" 225 ELT_walk_patches "${d}/ltmain.sh" "${p}"
201 ret=$? 226 ret=$?
202 fi 227 fi
203 ;; 228 ;;
204 "rem-int-dep") 229 rem-int-dep)
205 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 230 ELT_walk_patches "${d}/ltmain.sh" "${p}" "${deptoremove}"
206 ret=$? 231 ret=$?
207 ;; 232 ;;
208 "fix-relink") 233 fix-relink)
209 # 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 ...
210 if [[ -n $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then 235 if grep -qs 'inst_prefix_dir' "${d}/ltmain.sh" ; then
211 ELT_walk_patches "${x}/ltmain.sh" "${y}" 236 ELT_walk_patches "${d}/ltmain.sh" "${p}"
212 ret=$? 237 ret=$?
213 fi 238 fi
214 ;; 239 ;;
215 "max_cmd_len") 240 max_cmd_len)
216 # Do not apply if $max_cmd_len is not used ... 241 # Do not apply if $max_cmd_len is not used ...
217 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then 242 if grep -qs 'max_cmd_len' "${d}/ltmain.sh" ; then
218 ELT_walk_patches "${x}/ltmain.sh" "${y}" 243 ELT_walk_patches "${d}/ltmain.sh" "${p}"
219 ret=$? 244 ret=$?
220 fi 245 fi
221 ;; 246 ;;
222 "as-needed") 247 as-needed)
223 ELT_walk_patches "${x}/ltmain.sh" "${y}" 248 ELT_walk_patches "${d}/ltmain.sh" "${p}"
224 ret=$? 249 ret=$?
225 ;; 250 ;;
226 "uclibc-conf") 251 uclibc-conf)
227 if [[ -e ${x}/configure && \
228 -n $(grep 'Transform linux' "${x}/configure") ]] ; then 252 if grep -qs 'Transform linux' "${d}/configure" ; then
229 ELT_walk_patches "${x}/configure" "${y}" 253 ELT_walk_patches "${d}/configure" "${p}"
230 ret=$? 254 ret=$?
231 # ltmain.sh and co might be in a subdirectory ... 255 # ltmain.sh and co might be in a subdirectory ...
232 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \ 256 elif [[ ! -e ${d}/configure ]] && \
233 -n $(grep 'Transform linux' "${x}/../configure") ]] ; then 257 grep -qs 'Transform linux' "${d}/../configure" ; then
234 ELT_walk_patches "${x}/../configure" "${y}" 258 ELT_walk_patches "${d}/../configure" "${p}"
235 ret=$? 259 ret=$?
236 fi 260 fi
237 ;; 261 ;;
238 "uclibc-ltconf") 262 uclibc-ltconf)
239 # Newer libtoolize clears ltconfig, as not used anymore 263 # Newer libtoolize clears ltconfig, as not used anymore
240 if [[ -s ${x}/ltconfig ]] ; then 264 if [[ -s ${d}/ltconfig ]] ; then
241 ELT_walk_patches "${x}/ltconfig" "${y}" 265 ELT_walk_patches "${d}/ltconfig" "${p}"
242 ret=$? 266 ret=$?
243 fi 267 fi
244 ;; 268 ;;
245 "fbsd-conf") 269 fbsd-conf)
246 if [[ -e ${x}/configure && \
247 -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then 270 if grep -qs 'version_type=freebsd-' "${d}/configure" ; then
248 ELT_walk_patches "${x}/configure" "${y}" 271 ELT_walk_patches "${d}/configure" "${p}"
249 ret=$? 272 ret=$?
250 # ltmain.sh and co might be in a subdirectory ... 273 # ltmain.sh and co might be in a subdirectory ...
251 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \ 274 elif [[ ! -e ${d}/configure ]] && \
252 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then 275 grep -qs 'version_type=freebsd-' "${d}/../configure" ; then
253 ELT_walk_patches "${x}/../configure" "${y}" 276 ELT_walk_patches "${d}/../configure" "${p}"
254 ret=$? 277 ret=$?
255 fi 278 fi
256 ;; 279 ;;
257 "fbsd-ltconf") 280 fbsd-ltconf)
258 if [[ -s ${x}/ltconfig ]] ; then 281 if [[ -s ${d}/ltconfig ]] ; then
259 ELT_walk_patches "${x}/ltconfig" "${y}" 282 ELT_walk_patches "${d}/ltconfig" "${p}"
260 ret=$? 283 ret=$?
261 fi 284 fi
262 ;; 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 ;;
263 "darwin-ltconf") 297 darwin-ltconf)
264 # Newer libtoolize clears ltconfig, as not used anymore 298 # Newer libtoolize clears ltconfig, as not used anymore
265 if [[ -s ${x}/ltconfig ]] ; then 299 if [[ -s ${d}/ltconfig ]] ; then
266 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}"
267 ret=$? 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=$?
268 fi 327 fi
328 if [[ $subret -eq 0 ]]; then
329 # have at least one patch succeeded.
330 ret=0
331 fi
332 done
269 ;; 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 ;;
270 "install-sh") 353 install-sh)
271 ELT_walk_patches "${x}/install-sh" "${y}" 354 ELT_walk_patches "${d}/install-sh" "${p}"
272 ret=$? 355 ret=$?
273 ;; 356 ;;
274 "cross") 357 cross)
275 if tc-is-cross-compiler ; then 358 if tc-is-cross-compiler ; then
276 ELT_walk_patches "${x}/ltmain.sh" "${y}" 359 ELT_walk_patches "${d}/ltmain.sh" "${p}"
277 ret=$? 360 ret=$?
278 fi 361 fi
279 ;; 362 ;;
280 *) 363 *)
281 ELT_walk_patches "${x}/ltmain.sh" "${y}" 364 ELT_walk_patches "${d}/ltmain.sh" "${p}"
282 ret=$? 365 ret=$?
283 ;; 366 ;;
284 esac 367 esac
285 368
286 if [[ ${ret} -ne 0 ]] ; then 369 if [[ ${ret} -ne 0 ]] ; then
287 case ${y} in 370 case ${p} in
288 "relink") 371 relink)
289 local version=$(ELT_libtool_version "${x}/ltmain.sh") 372 local version=$(ELT_libtool_version "${d}/ltmain.sh")
290 # Critical patch, but could be applied ... 373 # Critical patch, but could be applied ...
291 # FIXME: Still need a patch for ltmain.sh > 1.4.0 374 # FIXME: Still need a patch for ltmain.sh > 1.4.0
292 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \ 375 if ! grep -qs 'inst_prefix_dir' "${d}/ltmain.sh" && \
293 $(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
294 ewarn " Could not apply relink.patch!" 377 ewarn " Could not apply relink.patch!"
295 fi 378 fi
296 ;; 379 ;;
297 "portage") 380 portage)
298 # Critical patch - for this one we abort, as it can really 381 # Critical patch - for this one we abort, as it can really
299 # cause breakage without it applied! 382 # cause breakage without it applied!
300 if [[ ${do_portage} == "yes" ]] ; then 383 if [[ ${do_portage} == "yes" ]] ; then
301 # Stupid test to see if its already applied ... 384 # Stupid test to see if its already applied ...
302 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
303 echo 386 echo
304 eerror "Portage patch requested, but failed to apply!" 387 eerror "Portage patch requested, but failed to apply!"
305 eerror "Please bug azarah or vapier to add proper patch." 388 eerror "Please file a bug report to add a proper patch."
306 die "Portage patch requested, but failed to apply!" 389 die "Portage patch requested, but failed to apply!"
307 fi 390 fi
308 else 391 else
309 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
310 # ewarn " Portage patch seems to be already applied." 393 # ewarn " Portage patch seems to be already applied."
311 # ewarn " Please verify that it is not needed." 394 # ewarn " Please verify that it is not needed."
312 : 395 :
313 else 396 else
314 local version=$( \ 397 local version=$(ELT_libtool_version "${d}"/ltmain.sh)
315 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
316 echo "${VERSION}")
317
318 echo 398 echo
319 eerror "Portage patch failed to apply (ltmain.sh version ${version})!" 399 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
320 eerror "Please bug azarah or vapier to add proper patch." 400 eerror "Please file a bug report to add a proper patch."
321 die "Portage patch failed to apply!" 401 die "Portage patch failed to apply!"
322 fi 402 fi
323 # We do not want to run libtoolize ... 403 # We do not want to run libtoolize ...
324 ELT_APPLIED_PATCHES="portage" 404 ELT_APPLIED_PATCHES="portage"
325 fi 405 fi
326 ;; 406 ;;
327 "uclibc-"*) 407 uclibc-*)
328 [[ ${CHOST} == *"-uclibc" ]] && \
329 ewarn " uClibc patch set '${y}' failed to apply!" 408 [[ ${CHOST} == *-uclibc ]] && ewarn " uClibc patch set '${p}' failed to apply!"
330 ;; 409 ;;
331 "fbsd-"*) 410 fbsd-*)
332 if [[ ${CHOST} == *"-freebsd"* ]] ; then 411 if [[ ${CHOST} == *-freebsd* ]] ; then
333 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \ 412 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
334 "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then 413 "${d}/configure" "${d}/../configure" 2>/dev/null) ]]; then
335 eerror " FreeBSD patch set '${y}' failed to apply!" 414 eerror " FreeBSD patch set '${p}' failed to apply!"
336 die "FreeBSD patch set '${y}' failed to apply!" 415 die "FreeBSD patch set '${p}' failed to apply!"
337 fi 416 fi
338 fi 417 fi
339 ;; 418 ;;
340 "darwin-"*) 419 darwin-*)
341 [[ ${CHOST} == *"-darwin"* ]] && \
342 ewarn " Darwin patch set '${y}' failed to apply!" 420 [[ ${CHOST} == *"-darwin"* ]] && ewarn " Darwin patch set '${p}' failed to apply!"
343 ;; 421 ;;
344 esac 422 esac
345 fi 423 fi
346 done 424 done
347 425
354 ewarn "Cannot apply any patches, please file a bug about this" 432 ewarn "Cannot apply any patches, please file a bug about this"
355 die 433 die
356 fi 434 fi
357 fi 435 fi
358 436
359 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool" 437 rm -f "${d}/libtool"
360 438
361 >> "${x}/.elibtoolized" 439 > "${d}/.elibtoolized"
362 done 440 done
363
364 cd "${start_dir}"
365} 441}
366 442
367uclibctoolize() { 443uclibctoolize() { die "Use elibtoolize"; }
368 ewarn "uclibctoolize() is deprecated, please just use elibtoolize()!" 444darwintoolize() { die "Use elibtoolize"; }
369 elibtoolize
370}
371
372darwintoolize() {
373 ewarn "darwintoolize() is deprecated, please just use elibtoolize()!"
374 elibtoolize
375}
376 445
377# char *VER_major(string) 446# char *VER_major(string)
378# 447#
379# Return the Major (X of X.Y.Z) version 448# Return the Major (X of X.Y.Z) version
380# 449#
430 fi 499 fi
431 500
432 echo 1 501 echo 1
433 return 1 502 return 1
434} 503}
504
505fi

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

  ViewVC Help
Powered by ViewVC 1.1.20