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

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

  ViewVC Help
Powered by ViewVC 1.1.20