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

Diff of /eclass/libtool.eclass

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

Revision 1.62 Revision 1.85
1# Copyright 1999-2005 Gentoo Foundation 1# Copyright 1999-2007 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.62 2005/12/07 22:50:05 azarah Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.85 2010/03/12 08:17:40 haubi Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Maintainer: base-system@gentoo.org
6# 6#
7# This eclass patches ltmain.sh distributed with libtoolized packages with the 7# This eclass patches ltmain.sh distributed with libtoolized packages with the
8# relink and portage patch among others 8# relink and portage patch among others
9 9#
10 10# Note, this eclass does not require libtool as it only applies patches to
11# 2004.09.25 rac 11# generated libtool files. We do not run the libtoolize program because that
12# i have verified that at least one package can use this eclass and 12# requires a regeneration of the main autotool files in order to work properly.
13# build properly even without libtool installed yet, probably using
14# the files in the distribution. eliminating this dependency fixes
15# bug 65209, which is a showstopper for people doing installs using
16# stageballs <3. if anybody decides to revert this, please attempt
17# to find an alternate way of resolving that bug at the same time.
18 13
19DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
20 15
21ELIBTOOL_VERSION="2.0.2" 16ELIBTOOL_VERSION="2.0.2"
22 17
18inherit toolchain-funcs
19
23ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches" 20ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
24ELT_APPLIED_PATCHES= 21ELT_APPLIED_PATCHES=
25ELT_LTMAIN_SH= 22ELT_LTMAIN_SH=
26 23
27# 24#
28# Returns all the directories containing ltmain.sh 25# Returns all the directories containing ltmain.sh
… …
84 local ret=1 81 local ret=1
85 local file=$1 82 local file=$1
86 local patch_set=$2 83 local patch_set=$2
87 local patch_dir= 84 local patch_dir=
88 local rem_int_dep=$3 85 local rem_int_dep=$3
89 local version=
90 local ltmain_sh=$1
91
92 [[ ${file} == *"/configure" ]] && ltmain_sh=${ELT_LTMAIN_SH}
93 version=$(ELT_libtool_version "${ltmain_sh}")
94 86
95 if [[ -n ${patch_set} ]] ; then 87 if [[ -n ${patch_set} ]] ; then
96 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then 88 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then
97 patch_dir="${ELT_PATCH_DIR}/${patch_set}" 89 patch_dir="${ELT_PATCH_DIR}/${patch_set}"
98 else 90 else
99 return "${ret}" 91 return "${ret}"
100 fi 92 fi
101 93
102 if [[ ${version} == "0" ]] ; then
103 eerror "Could not get VERSION for ${file##*/}!"
104 die "Could not get VERSION for ${file##*/}!"
105 fi
106
107 # Go through the patches in reverse order (large to small) 94 # Go through the patches in reverse order (large to small)
108 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | grep -v 'CVS' | sort -r) ; do 95 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | grep -v 'CVS' | sort -r) ; do
109 if [[ -n ${x} && -f ${x} ]] ; then 96 if [[ -n ${x} && -f ${x} ]] ; then
110 local ltver=$(VER_to_int "${version}")
111 local ptver=$(VER_to_int "${x##*/}")
112
113 # If libtool version smaller than patch version, skip patch.
114 [[ ${ltver} -lt ${ptver} ]] && continue
115 # For --remove-internal-dep ... 97 # For --remove-internal-dep ...
116 if [[ -n ${rem_int_dep} ]] ; then 98 if [[ -n ${rem_int_dep} ]] ; then
117 # For replace @REM_INT_DEP@ with what was passed 99 # For replace @REM_INT_DEP@ with what was passed
118 # to --remove-internal-dep 100 # to --remove-internal-dep
119 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \ 101 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
… …
140 local do_reversedeps="no" 122 local do_reversedeps="no"
141 local do_only_patches="no" 123 local do_only_patches="no"
142 local do_uclibc="yes" 124 local do_uclibc="yes"
143 local deptoremove= 125 local deptoremove=
144 local my_dirlist= 126 local my_dirlist=
145 local elt_patches="portage relink max_cmd_len sed test tmp" 127 local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed"
146 local start_dir=${PWD} 128 local start_dir=${PWD}
147 129
148 my_dirlist=$(ELT_find_ltmain_sh) 130 my_dirlist=$(ELT_find_ltmain_sh)
149 131
150 for x in "$@" ; do 132 for x in "$@" ; do
… …
190 done 172 done
191 173
192 [[ ${do_uclibc} == "yes" ]] && \ 174 [[ ${do_uclibc} == "yes" ]] && \
193 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf" 175 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
194 176
195 [[ ${CHOST} == *"-freebsd"* ]] && \ 177 case "${CHOST}" in
178 *-aix*)
196 elt_patches="${elt_patches} fbsd-conf" 179 elt_patches="${elt_patches} hardcode aixrtl"
197 180 ;;
198 if useq ppc-macos ; then 181 *-darwin*)
199 local opts
200 [[ -f Makefile.am ]] && opts="--automake"
201 glibtoolize --copy --force ${opts}
202
203 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain" 182 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain darwin-conf"
204 fi 183 ;;
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"
189 ;;
190 *-irix*)
191 elt_patches="${elt_patches} irix-ltmain"
192 ;;
193 *-mint*)
194 elt_patches="${elt_patches} mint-conf"
195 ;;
196 esac
205 197
206 for x in ${my_dirlist} ; do 198 for x in ${my_dirlist} ; do
207 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||") 199 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
208 export ELT_APPLIED_PATCHES= 200 export ELT_APPLIED_PATCHES=
209 export ELT_LTMAIN_SH="${x}/ltmain.sh" 201 export ELT_LTMAIN_SH="${x}/ltmain.sh"
… …
215 207
216 for y in ${elt_patches} ; do 208 for y in ${elt_patches} ; do
217 local ret=0 209 local ret=0
218 210
219 case "${y}" in 211 case "${y}" in
212 "portage")
213 # Stupid test to see if its already applied ...
214 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
215 ELT_walk_patches "${x}/ltmain.sh" "${y}"
216 ret=$?
217 fi
218 ;;
220 "rem-int-dep") 219 "rem-int-dep")
221 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 220 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
222 ret=$? 221 ret=$?
223 ;; 222 ;;
224 "fix-relink") 223 "fix-relink")
… …
233 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then 232 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
234 ELT_walk_patches "${x}/ltmain.sh" "${y}" 233 ELT_walk_patches "${x}/ltmain.sh" "${y}"
235 ret=$? 234 ret=$?
236 fi 235 fi
237 ;; 236 ;;
237 "as-needed")
238 ELT_walk_patches "${x}/ltmain.sh" "${y}"
239 ret=$?
240 ;;
238 "uclibc-conf") 241 "uclibc-conf")
239 if [[ -e ${x}/configure && \ 242 if [[ -e ${x}/configure && \
240 -n $(grep 'Transform linux' "${x}/configure") ]] ; then 243 -n $(grep 'Transform linux' "${x}/configure") ]] ; then
241 ELT_walk_patches "${x}/configure" "${y}" 244 ELT_walk_patches "${x}/configure" "${y}"
242 ret=$? 245 ret=$?
… …
264 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then 267 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
265 ELT_walk_patches "${x}/../configure" "${y}" 268 ELT_walk_patches "${x}/../configure" "${y}"
266 ret=$? 269 ret=$?
267 fi 270 fi
268 ;; 271 ;;
272 "fbsd-ltconf")
273 if [[ -s ${x}/ltconfig ]] ; then
274 ELT_walk_patches "${x}/ltconfig" "${y}"
275 ret=$?
276 fi
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 ;;
269 "darwin-ltconf") 290 "darwin-ltconf")
270 # Newer libtoolize clears ltconfig, as not used anymore 291 # Newer libtoolize clears ltconfig, as not used anymore
271 if [[ -s ${x}/ltconfig ]] ; then 292 if [[ -s ${x}/ltconfig ]] ; then
272 ELT_walk_patches "${x}/ltconfig" "${y}" 293 ELT_walk_patches "${x}/ltconfig" "${y}"
294 ret=$?
295 fi
296 ;;
297 "darwin-ltmain")
298 # special case to avoid false positives (failing to apply
299 # ltmain.sh path message), newer libtools have this patch
300 # built in, so not much to patch around then
301 if [[ -e ${x}/ltmain.sh && \
302 -z $(grep 'verstring="-compatibility_version' "${x}/ltmain.sh") ]] ; then
303 ELT_walk_patches "${x}/ltmain.sh" "${y}"
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=$?
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
321 if [[ $subret -eq 0 ]]; then
322 # have at least one patch succeeded.
323 ret=0
324 fi
325 done
326 ;;
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")
344 ELT_walk_patches "${x}/install-sh" "${y}"
345 ret=$?
346 ;;
347 "cross")
348 if tc-is-cross-compiler ; then
349 ELT_walk_patches "${x}/ltmain.sh" "${y}"
273 ret=$? 350 ret=$?
274 fi 351 fi
275 ;; 352 ;;
276 *) 353 *)
277 ELT_walk_patches "${x}/ltmain.sh" "${y}" 354 ELT_walk_patches "${x}/ltmain.sh" "${y}"
… …
296 if [[ ${do_portage} == "yes" ]] ; then 373 if [[ ${do_portage} == "yes" ]] ; then
297 # Stupid test to see if its already applied ... 374 # Stupid test to see if its already applied ...
298 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 375 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
299 echo 376 echo
300 eerror "Portage patch requested, but failed to apply!" 377 eerror "Portage patch requested, but failed to apply!"
378 eerror "Please bug azarah or vapier to add proper patch."
301 die "Portage patch requested, but failed to apply!" 379 die "Portage patch requested, but failed to apply!"
302 fi 380 fi
303 else 381 else
304 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 382 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
305 # ewarn " Portage patch seems to be already applied." 383 # ewarn " Portage patch seems to be already applied."
… …
310 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \ 388 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
311 echo "${VERSION}") 389 echo "${VERSION}")
312 390
313 echo 391 echo
314 eerror "Portage patch failed to apply (ltmain.sh version ${version})!" 392 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
393 eerror "Please bug azarah or vapier to add proper patch."
315 die "Portage patch failed to apply!" 394 die "Portage patch failed to apply!"
316 fi 395 fi
317 # We do not want to run libtoolize ... 396 # We do not want to run libtoolize ...
318 ELT_APPLIED_PATCHES="portage" 397 ELT_APPLIED_PATCHES="portage"
319 fi 398 fi
… …
322 [[ ${CHOST} == *"-uclibc" ]] && \ 401 [[ ${CHOST} == *"-uclibc" ]] && \
323 ewarn " uClibc patch set '${y}' failed to apply!" 402 ewarn " uClibc patch set '${y}' failed to apply!"
324 ;; 403 ;;
325 "fbsd-"*) 404 "fbsd-"*)
326 if [[ ${CHOST} == *"-freebsd"* ]] ; then 405 if [[ ${CHOST} == *"-freebsd"* ]] ; then
327 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' "${x}/configure") ]]; then 406 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
407 "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then
328 eerror " FreeBSD patch set '${y}' failed to apply!" 408 eerror " FreeBSD patch set '${y}' failed to apply!"
329 die "FreeBSD patch set '${y}' failed to apply!" 409 die "FreeBSD patch set '${y}' failed to apply!"
330 fi 410 fi
331 fi 411 fi
332 ;; 412 ;;
333 "darwin-"*) 413 "darwin-"*)
334 useq ppc-macos && \ 414 [[ ${CHOST} == *"-darwin"* ]] && \
335 ewarn " Darwin patch set '${y}' failed to apply!" 415 ewarn " Darwin patch set '${y}' failed to apply!"
336 ;; 416 ;;
337 esac 417 esac
338 fi 418 fi
339 done 419 done
… …
343 ${do_reversedeps} == "no" && \ 423 ${do_reversedeps} == "no" && \
344 ${do_only_patches} == "no" && \ 424 ${do_only_patches} == "no" && \
345 ${deptoremove} == "" ]] 425 ${deptoremove} == "" ]]
346 then 426 then
347 ewarn "Cannot apply any patches, please file a bug about this" 427 ewarn "Cannot apply any patches, please file a bug about this"
348 break
349
350 # Sometimes ltmain.sh is in a subdirectory ...
351 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
352 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
353 cd "${x}"/../
354 fi
355 fi 428 die
356
357 if type -p libtoolize &> /dev/null ; then
358 ewarn "Cannot apply any patches, running libtoolize..."
359 libtoolize --copy --force
360 fi
361 cd "${x}"
362 break
363 fi 429 fi
364 fi 430 fi
365 431
366 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool" 432 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
367 433
368 touch "${x}/.elibtoolized" 434 >> "${x}/.elibtoolized"
369 done 435 done
370 436
371 cd "${start_dir}" 437 cd "${start_dir}"
372} 438}
373 439
374uclibctoolize() { 440uclibctoolize() {
375 ewarn "uclibctoolize() is depreciated, please just use elibtoolize()!" 441 ewarn "uclibctoolize() is deprecated, please just use elibtoolize()!"
376 elibtoolize 442 elibtoolize
377} 443}
378 444
379darwintoolize() { 445darwintoolize() {
380 ewarn "darwintoolize() is depreciated, please just use elibtoolize()!" 446 ewarn "darwintoolize() is deprecated, please just use elibtoolize()!"
381 elibtoolize 447 elibtoolize
382} 448}
383 449
384# char *VER_major(string) 450# char *VER_major(string)
385# 451#
Legend:
Removed from v.1.62  
changed lines
  Added in v.1.85
  ViewVC Help
Powered by ViewVC 1.1.13