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

Diff of /eclass/libtool.eclass

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

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