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

Diff of /eclass/libtool.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20