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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.74  
changed lines
  Added in v.1.103

  ViewVC Help
Powered by ViewVC 1.1.20