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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.84  
changed lines
  Added in v.1.92

  ViewVC Help
Powered by ViewVC 1.1.20