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

Diff of /eclass/libtool.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20