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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.85  
changed lines
  Added in v.1.105

  ViewVC Help
Powered by ViewVC 1.1.20