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

Diff of /eclass/libtool.eclass

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

Revision 1.35 Revision 1.42
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 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.35 2004/09/29 03:49:59 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.42 2005/01/31 03:02:13 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@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
16# the files in the distribution. eliminating this dependency fixes 16# the files in the distribution. eliminating this dependency fixes
17# bug 65209, which is a showstopper for people doing installs using 17# bug 65209, which is a showstopper for people doing installs using
18# stageballs <3. if anybody decides to revert this, please attempt 18# stageballs <3. if anybody decides to revert this, please attempt
19# to find an alternate way of resolving that bug at the same time. 19# to find an alternate way of resolving that bug at the same time.
20 20
21#DEPEND="!bootstrap? ( sys-devel/libtool )"
22
23DESCRIPTION="Based on the ${ECLASS} eclass" 21DESCRIPTION="Based on the ${ECLASS} eclass"
24 22
25ELIBTOOL_VERSION="2.0.1" 23ELIBTOOL_VERSION="2.0.1"
26
27 24
28ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches" 25ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches"
29ELT_APPLIED_PATCHES= 26ELT_APPLIED_PATCHES=
30 27
31# 28#
33# 30#
34ELT_find_ltmain_sh() { 31ELT_find_ltmain_sh() {
35 local x= 32 local x=
36 local dirlist= 33 local dirlist=
37 34
38 for x in $(find "${S}" -name 'ltmain.sh') 35 for x in $(find "${S}" -name 'ltmain.sh') ; do
39 do
40 dirlist="${dirlist} ${x%/*}" 36 dirlist="${dirlist} ${x%/*}"
41 done 37 done
42 38
43 echo "${dirlist}" 39 echo "${dirlist}"
44} 40}
49ELT_try_and_apply_patch() { 45ELT_try_and_apply_patch() {
50 local ret=0 46 local ret=0
51 local patch="$2" 47 local patch="$2"
52 48
53 # We only support patchlevel of 0 - why worry if its static patches? 49 # We only support patchlevel of 0 - why worry if its static patches?
54 if patch -p0 --dry-run $1 < ${patch} &>${T}/elibtool.log 50 if patch -p0 --dry-run $1 < ${patch} &> ${T}/elibtool.log ; then
55 then
56 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch..." 51 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
57 patch -p0 $1 < ${patch} &>${T}/elibtool.log 52 patch -p0 $1 < ${patch} &>${T}/elibtool.log
58 ret=$? 53 ret=$?
59 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}" 54 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
60 else 55 else
61 ret=1 56 ret=1
72 local x= 67 local x=
73 local y= 68 local y=
74 local ret=1 69 local ret=1
75 local patch_dir= 70 local patch_dir=
76 71
77 if [ -n "$2" ] 72 if [[ -n $2 ]] ; then
78 then
79 if [ -d "${ELT_PATCH_DIR}/$2" ] 73 if [[ -d ${ELT_PATCH_DIR}/$2 ]] ; then
80 then
81 patch_dir="${ELT_PATCH_DIR}/$2" 74 patch_dir="${ELT_PATCH_DIR}/$2"
82 else 75 else
83 return ${ret} 76 return ${ret}
84 fi 77 fi
85 78
86 for x in $(ls -d "${patch_dir}"/* 2>/dev/null) 79 for x in $(ls -d "${patch_dir}"/* 2> /dev/null) ; do
87 do 80 if [[ -n ${x} && -f ${x} ]] ; then
88 if [ -n "${x}" -a -f "${x}" ]
89 then
90 # For --remove-internal-dep ... 81 # For --remove-internal-dep ...
91 if [ -n "$3" ] 82 if [[ -n $3 ]] ; then
92 then
93 # For replace @REM_INT_DEP@ with what was passed 83 # For replace @REM_INT_DEP@ with what was passed
94 # to --remove-internal-dep 84 # to --remove-internal-dep
95 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \ 85 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \
96 ${T}/$$.rem_int_deps.patch 86 ${T}/$$.rem_int_deps.patch
97 87
98 x="${T}/$$.rem_int_deps.patch" 88 x="${T}/$$.rem_int_deps.patch"
99 fi 89 fi
100 90
101 if ELT_try_and_apply_patch "$1" "${x}" 91 if ELT_try_and_apply_patch "$1" "${x}" ; then
102 then
103 ret=0 92 ret=0
104 break 93 break
105 fi 94 fi
106 fi 95 fi
107 done 96 done
121 local elt_patches="portage relink max_cmd_len sed test tmp" 110 local elt_patches="portage relink max_cmd_len sed test tmp"
122 local start_dir="${PWD}" 111 local start_dir="${PWD}"
123 112
124 my_dirlist="$(ELT_find_ltmain_sh)" 113 my_dirlist="$(ELT_find_ltmain_sh)"
125 114
126 for x in "$@" 115 for x in "$@" ; do
127 do
128 case "${x}" in 116 case "${x}" in
129 "--portage") 117 "--portage")
130 # Only apply portage patch, and don't 118 # Only apply portage patch, and don't
131 # 'libtoolize --copy --force' if all patches fail. 119 # 'libtoolize --copy --force' if all patches fail.
132 do_portage="yes" 120 do_portage="yes"
156 my_dirlist="${S}" 144 my_dirlist="${S}"
157 else 145 else
158 my_dirlist= 146 my_dirlist=
159 fi 147 fi
160 ;; 148 ;;
149 "--no-uclibc")
150 NO_UCLIBCTOOLIZE=1
151 ;;
152 *)
153 eerror "Invalid elibtoolize option: $x"
154 die "elibtoolize called with $x ??"
161 esac 155 esac
162 done 156 done
163 157
158 if use ppc-macos ; then
159 glibtoolize --copy --force
160 darwintoolize
161 fi
162
164 for x in ${my_dirlist} 163 for x in ${my_dirlist} ; do
165 do
166 local tmp="$(echo "${x}" | sed -e "s|${S}||")" 164 local tmp=$(echo "${x}" | sed -e "s|${S}||")
167 export ELT_APPLIED_PATCHES= 165 export ELT_APPLIED_PATCHES=
168 166
169 cd ${x} 167 cd ${x}
170 einfo "Patching \${S}$(echo "/${tmp}/ltmain.sh" | sed -e 's|//|/|g')..." 168 einfo "Patching \${S}$(echo "/${tmp}/ltmain.sh" | sed -e 's|//|/|g') ..."
171 169
172 for y in ${elt_patches} 170 for y in ${elt_patches} ; do
173 do
174 local ret=0 171 local ret=0
175 172
176 case "${y}" in 173 case "${y}" in
177 "rem-int-dep") 174 "rem-int-dep")
178 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 175 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
179 ret=$? 176 ret=$?
180 ;; 177 ;;
181 "fix-relink") 178 "fix-relink")
182 # Do not apply if we do not have the relink patch applied ... 179 # Do not apply if we do not have the relink patch applied ...
183 if [ -n "$(grep 'inst_prefix_dir' "${x}/ltmain.sh")" ] 180 if [[ -n $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then
184 then
185 ELT_walk_patches "${x}/ltmain.sh" "${y}" 181 ELT_walk_patches "${x}/ltmain.sh" "${y}"
186 ret=$? 182 ret=$?
187 fi 183 fi
188 ;; 184 ;;
189 "max_cmd_len") 185 "max_cmd_len")
190 # Do not apply if $max_cmd_len is not used ... 186 # Do not apply if $max_cmd_len is not used ...
191 if [ -n "$(grep 'max_cmd_len' "${x}/ltmain.sh")" ] 187 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
192 then
193 ELT_walk_patches "${x}/ltmain.sh" "${y}" 188 ELT_walk_patches "${x}/ltmain.sh" "${y}"
194 ret=$? 189 ret=$?
195 fi 190 fi
196 ;; 191 ;;
197 *) 192 *)
198 ELT_walk_patches "${x}/ltmain.sh" "${y}" 193 ELT_walk_patches "${x}/ltmain.sh" "${y}"
199 ret=$? 194 ret=$?
200 ;; 195 ;;
201 esac 196 esac
202 197
203 if [ "${ret}" -ne 0 ] 198 if [[ ${ret} -ne 0 ]] ; then
204 then
205 case ${y} in 199 case ${y} in
206 "relink") 200 "relink")
207 # Critical patch, but could be applied ... 201 # Critical patch, but could be applied ...
208 if [ -z "$(grep 'inst_prefix_dir' "${x}/ltmain.sh")" ] 202 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then
209 then
210 ewarn " Could not apply relink.patch!" 203 ewarn " Could not apply relink.patch!"
211 fi 204 fi
212 ;; 205 ;;
213 "portage") 206 "portage")
214 # Critical patch - for this one we abort, as it can really 207 # Critical patch - for this one we abort, as it can really
215 # cause breakage without it applied! 208 # cause breakage without it applied!
216 if [ "${do_portage}" = "yes" ] 209 if [[ ${do_portage} == "yes" ]] ; then
217 then
218 # Stupid test to see if its already applied ... 210 # Stupid test to see if its already applied ...
219 if [ -z "$(grep 'We do not want portage' "${x}/ltmain.sh")" ] 211 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
220 then
221 echo 212 echo
222 eerror "Portage patch requested, but failed to apply!" 213 eerror "Portage patch requested, but failed to apply!"
223 die "Portage patch requested, but failed to apply!" 214 die "Portage patch requested, but failed to apply!"
224 fi 215 fi
225 else 216 else
228 fi 219 fi
229 ;; 220 ;;
230 esac 221 esac
231 fi 222 fi
232 223
233 if [ -z "${ELT_APPLIED_PATCHES}" ] 224 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
234 then
235 if [ "${do_portage}" = "no" -a \ 225 if [[ ${do_portage} == "no" && \
236 "${do_reversedeps}" = "no" -a \ 226 ${do_reversedeps} == "no" && \
237 "${do_only_patches}" = "no" -a \ 227 ${do_only_patches} == "no" && \
238 "${deptoremove}" = "" ] 228 ${deptoremove} == "" ]]
239 then 229 then
240 # Sometimes ltmain.sh is in a subdirectory ... 230 # Sometimes ltmain.sh is in a subdirectory ...
241 if [ ! -f ${x}/configure.in -a ! -f ${x}/configure.ac ] 231 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
242 then
243 if [ -f ${x}/../configure.in -o -f ${x}/../configure.ac ] 232 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
244 then
245 cd ${x}/../ 233 cd "${x}"/../
246 fi 234 fi
247 fi 235 fi
248 236
249 if which libtoolize &>/dev/null 237 if type -p libtoolize &> /dev/null ; then
250 then
251 ewarn "Cannot apply any patch, running libtoolize..." 238 ewarn "Cannot apply any patch, running libtoolize..."
252 libtoolize --copy --force 239 libtoolize --copy --force
253 fi 240 fi
254 cd ${x} 241 cd "${x}"
255 break 242 break
256 fi 243 fi
257 fi 244 fi
258 done 245 done
259 done 246 done
260 247
261 if [ -f libtool ] 248 if [[ -f libtool ]] ; then
262 then
263 rm -f libtool 249 rm -f libtool
264 fi 250 fi
265 251
266 cd "${start_dir}" 252 cd "${start_dir}"
267 253
268 uclibctoolize 254 uclibctoolize
269} 255}
270 256
271uclibctoolize() { 257uclibctoolize() {
258 [[ -n ${NO_UCLIBCTOOLIZE} ]] && return 0
259
260 local errmsg=""
261 [[ ${CTARGET:-${CHOST}} == *-uclibc ]] \
262 && errmsg="PLEASE CHECK" \
263 || errmsg="Already patched"
272 local targets="" 264 local targets=""
273 local x 265 local x
274 266
275 if [ -z "$@" ] ; then 267 if [[ -z $* ]] ; then
276 targets="$(find ${S} -name configure -o -name ltconfig)" 268 targets=$(find ${S} -name configure -o -name ltconfig)
277 fi 269 fi
278 270
279 einfo "Applying uClibc/libtool patches ..." 271 einfo "Applying uClibc/libtool patches ..."
280 for x in ${targets} ; do 272 for x in ${targets} ; do
281 [ ! -s "${x}" ] && continue 273 [[ ! -s ${x} ]] && continue
282 case $(basename "${x}") in 274 case ${x##*/} in
283 configure) 275 configure)
284 if grep 'Transform linux' "${x}" >/dev/null ; then 276 if grep 'Transform linux' "${x}" > /dev/null ; then
285 ebegin " Fixing \${S}${x/${S}}" 277 ebegin " Fixing \${S}${x/${S}}"
286 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/configure.patch" > /dev/null 278 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/configure.patch" > /dev/null
287 eend $? "PLEASE CHECK ${x}" 279 eend $? "${errmsg} ${x}"
288 fi 280 fi
289 ;; 281 ;;
290 282
291 ltconfig) 283 ltconfig)
292 local ver="$(grep '^VERSION=' ${x})" 284 local ver=$(grep '^VERSION=' ${x})
293 ver="${ver/VERSION=}" 285 ver=${ver/VERSION=}
294 [ "${ver:0:3}" == "1.4" ] && ver="1.3" # 1.4 and 1.3 are compat 286 [[ ${ver:0:3} == "1.4" ]] && ver="1.3" # 1.4 and 1.3 are compat
295 ebegin " Fixing \${S}${x/${S}}" 287 ebegin " Fixing \${S}${x/${S}}"
296 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/ltconfig-${ver:0:3}.patch" > /dev/null 288 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/ltconfig-${ver:0:3}.patch" > /dev/null
289 eend $? "${errmsg} ${x}"
290 ;;
291 esac
292 done
293}
294
295darwintoolize() {
296 local targets=""
297 local x
298
299 if [[ -z $* ]] ; then
300 targets=$(find ${S} -name ltmain.sh -o -name ltconfig)
301 fi
302
303 einfo "Applying Darwin/libtool patches ..."
304 for x in ${targets} ; do
305 [[ ! -s ${x} ]] && continue
306 case ${x##*/} in
307 ltmain.sh|ltconfig)
308 local ver=$(grep '^VERSION=' ${x})
309 ver=${ver/VERSION=}
310 if [[ ${ver:0:3} == "1.4" || ${ver:0:3} == "1.5" ]] ; then
311 ver="1.3" # 1.4, 1.5 and 1.3 are compat
312 fi
313
314 ebegin " Fixing \${S}${x/${S}}"
315 patch -p0 "${x}" "${ELT_PATCH_DIR}/darwin/${x##*/}-${ver:0:3}.patch" > /dev/null
297 eend $? "PLEASE CHECK ${x}" 316 eend $? "PLEASE CHECK ${x}"
298 ;; 317 ;;
299 esac 318 esac
300 done 319 done
301} 320}

Legend:
Removed from v.1.35  
changed lines
  Added in v.1.42

  ViewVC Help
Powered by ViewVC 1.1.20