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

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

  ViewVC Help
Powered by ViewVC 1.1.20