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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.63  
changed lines
  Added in v.1.93

  ViewVC Help
Powered by ViewVC 1.1.20