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

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

  ViewVC Help
Powered by ViewVC 1.1.20