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

Diff of /eclass/libtool.eclass

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

Revision 1.92 Revision 1.97
1# Copyright 1999-2010 Gentoo Foundation 1# Copyright 1999-2011 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.92 2011/06/10 10:14:21 flameeyes Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.97 2011/12/13 21:28:15 vapier Exp $
4 4
5# @ECLASS: libtool.eclass 5# @ECLASS: libtool.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# base-system@gentoo.org 7# base-system@gentoo.org
8# @BLURB: quickly update bundled libtool code 8# @BLURB: quickly update bundled libtool code
12# 12#
13# 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
14# 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
15# 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.
16 16
17if [[ ${___ECLASS_ONCE_LIBTOOL} != "recur -_+^+_- spank" ]] ; then
18___ECLASS_ONCE_LIBTOOL="recur -_+^+_- spank"
19
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}
32
17DESCRIPTION="Based on the ${ECLASS} eclass" 33DESCRIPTION="Based on the ${ECLASS} eclass"
18 34
19inherit toolchain-funcs 35inherit multilib toolchain-funcs
20
21ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
22 36
23# 37#
24# See if we can apply $2 on $1, and if so, do it 38# See if we can apply $2 on $1, and if so, do it
25# 39#
26ELT_try_and_apply_patch() { 40ELT_try_and_apply_patch() {
27 local ret=0 41 local ret=0
28 local file=$1 42 local file=$1
29 local patch=$2 43 local patch=$2
44 local src=$3
45 local disp="${src} patch"
46 local log="${T}/elibtool.log"
30 47
31 echo -e "\nTrying $(basename "$(dirname "${patch}")")-${patch##*/}.patch on ${file}" \ 48 if [[ -z ${__ELT_NOTED_TMP} ]] ; then
32 &>> "${T}/elibtool.log" 49 __ELT_NOTED_TMP=true
50 printf 'temp patch: %s\n' "${patch}" > "${log}"
51 fi
52 printf '\nTrying %s\n' "${disp}" >> "${log}"
33 53
34 # 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?
35 if patch -p0 --dry-run "${file}" "${patch}" &>> "${T}/elibtool.log" ; then 55 if patch -p0 --dry-run "${file}" "${patch}" >> "${log}" 2>&1 ; then
36 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..." 56 einfo " Applying ${disp} ..."
37 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \ 57 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" >> "${log}" 2>&1
38 &>> "${T}/elibtool.log"
39 ret=$? 58 ret=$?
40 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}" 59 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${src}"
41 else 60 else
42 ret=1 61 ret=1
43 fi 62 fi
44 63
45 return "${ret}" 64 return "${ret}"
59# 78#
60# Run through the patches in $2 and see if any 79# Run through the patches in $2 and see if any
61# apply to $1 ... 80# apply to $1 ...
62# 81#
63ELT_walk_patches() { 82ELT_walk_patches() {
64 local patch 83 local patch tmp
65 local ret=1 84 local ret=1
66 local file=$1 85 local file=$1
67 local patch_set=$2 86 local patch_set=$2
68 local patch_dir="${ELT_PATCH_DIR}/${patch_set}" 87 local patch_dir="$(elt_patch_dir)/${patch_set}"
69 local rem_int_dep=$3 88 local rem_int_dep=$3
70 89
71 [[ -z ${patch_set} ]] && return 1 90 [[ -z ${patch_set} ]] && return 1
72 [[ ! -d ${patch_dir} ]] && return 1 91 [[ ! -d ${patch_dir} ]] && return 1
73 92
74 pushd "${ELT_PATCH_DIR}" >/dev/null 93 # Allow patches to use @GENTOO_LIBDIR@ replacements
94 local sed_args=( -e "s:@GENTOO_LIBDIR@:$(get_libdir):g" )
95 if [[ -n ${rem_int_dep} ]] ; then
96 # replace @REM_INT_DEP@ with what was passed
97 # to --remove-internal-dep
98 sed_args+=( -e "s|@REM_INT_DEP@|${rem_int_dep}|g" )
99 fi
100
101 pushd "$(elt_patch_dir)" >/dev/null || die
75 102
76 # Go through the patches in reverse order (newer version to older) 103 # 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 104 for patch in $(find "${patch_set}" -maxdepth 1 -type f | LC_ALL=C sort -r) ; do
78 # For --remove-internal-dep ... 105 tmp="${T}/libtool-elt.patch"
79 if [[ -n ${rem_int_dep} ]] ; then 106 sed "${sed_args[@]}" "${patch}" > "${tmp}" || die
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}
85 fi
86
87 if ELT_try_and_apply_patch "${file}" "${patch}" ; then 107 if ELT_try_and_apply_patch "${file}" "${tmp}" "${patch}" ; then
88 # Break to unwind w/popd rather than return directly 108 # Break to unwind w/popd rather than return directly
89 ret=0 109 ret=0
90 break 110 break
91 fi 111 fi
92 done 112 done
111 local do_reversedeps="no" 131 local do_reversedeps="no"
112 local do_only_patches="no" 132 local do_only_patches="no"
113 local do_uclibc="yes" 133 local do_uclibc="yes"
114 local deptoremove= 134 local deptoremove=
115 local do_shallow="no" 135 local do_shallow="no"
136 local force="false"
116 local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed" 137 local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed"
117 138
118 for x in "$@" ; do 139 for x in "$@" ; do
119 case ${x} in 140 case ${x} in
120 --portage) 141 --portage)
144 # Only patch the ltmain.sh in ${S} 165 # Only patch the ltmain.sh in ${S}
145 do_shallow="yes" 166 do_shallow="yes"
146 ;; 167 ;;
147 --no-uclibc) 168 --no-uclibc)
148 do_uclibc="no" 169 do_uclibc="no"
170 ;;
171 --force)
172 force="true"
149 ;; 173 ;;
150 *) 174 *)
151 eerror "Invalid elibtoolize option: ${x}" 175 eerror "Invalid elibtoolize option: ${x}"
152 die "elibtoolize called with ${x} ??" 176 die "elibtoolize called with ${x} ??"
153 esac 177 esac
178 202
179 local d p 203 local d p
180 for d in "$@" ; do 204 for d in "$@" ; do
181 export ELT_APPLIED_PATCHES= 205 export ELT_APPLIED_PATCHES=
182 206
183 [[ -f ${d}/.elibtoolized ]] && continue 207 if [[ -f ${d}/.elibtoolized ]] ; then
208 ${force} || continue
209 fi
184 210
185 einfo "Running elibtoolize in: ${d#${WORKDIR}/}/" 211 einfo "Running elibtoolize in: ${d#${WORKDIR}/}/"
212 if [[ -f ${d}/.elibtoolized ]] ; then
213 ewarn " We've already been run in this tree; you should"
214 ewarn " avoid this if possible (perhaps by filing a bug)"
215 fi
186 216
187 for p in ${elt_patches} ; do 217 for p in ${elt_patches} ; do
188 local ret=0 218 local ret=0
189 219
190 case ${p} in 220 case ${p} in
468 fi 498 fi
469 499
470 echo 1 500 echo 1
471 return 1 501 return 1
472} 502}
503
504fi

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

  ViewVC Help
Powered by ViewVC 1.1.20