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

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

  ViewVC Help
Powered by ViewVC 1.1.20