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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.87  
changed lines
  Added in v.1.102

  ViewVC Help
Powered by ViewVC 1.1.20