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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.62  
changed lines
  Added in v.1.91

  ViewVC Help
Powered by ViewVC 1.1.20