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

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

  ViewVC Help
Powered by ViewVC 1.1.20