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

Diff of /eclass/libtool.eclass

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

Revision 1.42 Revision 1.67
1# Copyright 1999-2005 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.42 2005/01/31 03:02:13 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.67 2006/04/05 17:50:34 azarah 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
9 9
10ECLASS="libtool"
11INHERITED="${INHERITED} ${ECLASS}"
12 10
13# 2004.09.25 rac 11# 2004.09.25 rac
14# i have verified that at least one package can use this eclass and 12# i have verified that at least one package can use this eclass and
15# build properly even without libtool installed yet, probably using 13# build properly even without libtool installed yet, probably using
16# the files in the distribution. eliminating this dependency fixes 14# the files in the distribution. eliminating this dependency fixes
18# stageballs <3. if anybody decides to revert this, please attempt 16# stageballs <3. if anybody decides to revert this, please attempt
19# to find an alternate way of resolving that bug at the same time. 17# to find an alternate way of resolving that bug at the same time.
20 18
21DESCRIPTION="Based on the ${ECLASS} eclass" 19DESCRIPTION="Based on the ${ECLASS} eclass"
22 20
23ELIBTOOL_VERSION="2.0.1" 21ELIBTOOL_VERSION="2.0.2"
24 22
25ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches" 23ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
26ELT_APPLIED_PATCHES= 24ELT_APPLIED_PATCHES=
25ELT_LTMAIN_SH=
27 26
28# 27#
29# Returns all the directories containing ltmain.sh 28# Returns all the directories containing ltmain.sh
30# 29#
31ELT_find_ltmain_sh() { 30ELT_find_ltmain_sh() {
42# 41#
43# See if we can apply $2 on $1, and if so, do it 42# See if we can apply $2 on $1, and if so, do it
44# 43#
45ELT_try_and_apply_patch() { 44ELT_try_and_apply_patch() {
46 local ret=0 45 local ret=0
46 local file=$1
47 local patch="$2" 47 local patch=$2
48 48
49 # 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?
50 if patch -p0 --dry-run $1 < ${patch} &> ${T}/elibtool.log ; then 50 if patch -p0 --dry-run "${file}" "${patch}" &> "${T}/elibtool.log" ; then
51 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..." 51 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
52 patch -p0 $1 < ${patch} &>${T}/elibtool.log 52 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \
53 &> "${T}/elibtool.log"
53 ret=$? 54 ret=$?
54 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}" 55 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
55 else 56 else
56 ret=1 57 ret=1
57 fi 58 fi
58 59
59 return ${ret} 60 return "${ret}"
61}
62
63#
64# Get string version of ltmain.sh or ltconfig (passed as $1)
65#
66ELT_libtool_version() {
67 local ltmain_sh=$1
68 local version=
69
70 version=$(eval $(grep -e '^[[:space:]]*VERSION=' "${ltmain_sh}"); \
71 echo "${VERSION}")
72 [[ -z ${version} ]] && version="0"
73
74 echo "${version}"
60} 75}
61 76
62# 77#
63# Run through the patches in $2 and see if any 78# Run through the patches in $2 and see if any
64# apply to $1 ... 79# apply to $1 ...
65# 80#
66ELT_walk_patches() { 81ELT_walk_patches() {
67 local x= 82 local x=
68 local y= 83 local y=
69 local ret=1 84 local ret=1
85 local file=$1
86 local patch_set=$2
70 local patch_dir= 87 local patch_dir=
88 local rem_int_dep=$3
71 89
72 if [[ -n $2 ]] ; then 90 if [[ -n ${patch_set} ]] ; then
73 if [[ -d ${ELT_PATCH_DIR}/$2 ]] ; then 91 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then
74 patch_dir="${ELT_PATCH_DIR}/$2" 92 patch_dir="${ELT_PATCH_DIR}/${patch_set}"
75 else 93 else
76 return ${ret} 94 return "${ret}"
77 fi 95 fi
78 96
97 # Go through the patches in reverse order (large to small)
79 for x in $(ls -d "${patch_dir}"/* 2> /dev/null) ; do 98 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | grep -v 'CVS' | sort -r) ; do
80 if [[ -n ${x} && -f ${x} ]] ; then 99 if [[ -n ${x} && -f ${x} ]] ; then
81 # For --remove-internal-dep ... 100 # For --remove-internal-dep ...
82 if [[ -n $3 ]] ; then 101 if [[ -n ${rem_int_dep} ]] ; then
83 # For replace @REM_INT_DEP@ with what was passed 102 # For replace @REM_INT_DEP@ with what was passed
84 # to --remove-internal-dep 103 # to --remove-internal-dep
85 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \ 104 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
86 ${T}/$$.rem_int_deps.patch 105 "${T}/$$.rem_int_deps.patch"
87 106
88 x="${T}/$$.rem_int_deps.patch" 107 x="${T}/$$.rem_int_deps.patch"
89 fi 108 fi
90 109
91 if ELT_try_and_apply_patch "$1" "${x}" ; then 110 if ELT_try_and_apply_patch "${file}" "${x}" ; then
92 ret=0 111 ret=0
93 break 112 break
94 fi 113 fi
95 fi 114 fi
96 done 115 done
97 fi 116 fi
98 117
99 return ${ret} 118 return "${ret}"
100} 119}
101 120
102elibtoolize() { 121elibtoolize() {
103 local x= 122 local x=
104 local y= 123 local y=
105 local do_portage="no" 124 local do_portage="no"
106 local do_reversedeps="no" 125 local do_reversedeps="no"
107 local do_only_patches="no" 126 local do_only_patches="no"
127 local do_uclibc="yes"
108 local deptoremove= 128 local deptoremove=
109 local my_dirlist= 129 local my_dirlist=
110 local elt_patches="portage relink max_cmd_len sed test tmp" 130 local elt_patches="portage relink max_cmd_len sed test tmp"
111 local start_dir="${PWD}" 131 local start_dir=${PWD}
112 132
113 my_dirlist="$(ELT_find_ltmain_sh)" 133 my_dirlist=$(ELT_find_ltmain_sh)
114 134
115 for x in "$@" ; do 135 for x in "$@" ; do
116 case "${x}" in 136 case "${x}" in
117 "--portage") 137 "--portage")
118 # Only apply portage patch, and don't 138 # Only apply portage patch, and don't
130 do_only_patches="yes" 150 do_only_patches="yes"
131 ;; 151 ;;
132 "^--remove-internal-dep="*) 152 "^--remove-internal-dep="*)
133 # We will replace @REM_INT_DEP@ with what is needed 153 # We will replace @REM_INT_DEP@ with what is needed
134 # in ELT_walk_patches() ... 154 # in ELT_walk_patches() ...
135 deptoremove="$(echo "${x}" | sed -e 's|--remove-internal-dep=||')" 155 deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||')
136 156
137 # Add the patch for this ... 157 # Add the patch for this ...
138 [ -n "${deptoremove}" ] && elt_patches="${elt_patches} rem-int-dep" 158 [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep"
139 ;; 159 ;;
140 "--shallow") 160 "--shallow")
141 # Only patch the ltmain.sh in ${S} 161 # Only patch the ltmain.sh in ${S}
142 if [ -f "${S}/ltmain.sh" ] 162 if [[ -f ${S}/ltmain.sh ]] ; then
143 then
144 my_dirlist="${S}" 163 my_dirlist=${S}
145 else 164 else
146 my_dirlist= 165 my_dirlist=
147 fi 166 fi
148 ;; 167 ;;
149 "--no-uclibc") 168 "--no-uclibc")
150 NO_UCLIBCTOOLIZE=1 169 do_uclibc="no"
151 ;; 170 ;;
152 *) 171 *)
153 eerror "Invalid elibtoolize option: $x" 172 eerror "Invalid elibtoolize option: ${x}"
154 die "elibtoolize called with $x ??" 173 die "elibtoolize called with ${x} ??"
155 esac 174 esac
156 done 175 done
157 176
177 [[ ${do_uclibc} == "yes" ]] && \
178 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
179
180 [[ ${CHOST} == *"-freebsd"* ]] && \
181 elt_patches="${elt_patches} fbsd-conf"
182
158 if use ppc-macos ; then 183 if useq ppc-macos ; then
184 local opts
185 [[ -f Makefile.am ]] && opts="--automake"
159 glibtoolize --copy --force 186 glibtoolize --copy --force ${opts}
160 darwintoolize 187
188 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
161 fi 189 fi
162 190
163 for x in ${my_dirlist} ; do 191 for x in ${my_dirlist} ; do
164 local tmp=$(echo "${x}" | sed -e "s|${S}||") 192 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
165 export ELT_APPLIED_PATCHES= 193 export ELT_APPLIED_PATCHES=
194 export ELT_LTMAIN_SH="${x}/ltmain.sh"
195
196 [[ -f ${x}/.elibtoolized ]] && continue
166 197
167 cd ${x} 198 cd ${x}
168 einfo "Patching \${S}$(echo "/${tmp}/ltmain.sh" | sed -e 's|//|/|g') ..." 199 einfo "Running elibtoolize in: $(echo "/${tmp}" | sed -e 's|//|/|g; s|^/||')"
169 200
170 for y in ${elt_patches} ; do 201 for y in ${elt_patches} ; do
171 local ret=0 202 local ret=0
172 203
173 case "${y}" in 204 case "${y}" in
205 "portage")
206 # Stupid test to see if its already applied ...
207 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
208 ELT_walk_patches "${x}/ltmain.sh" "${y}"
209 ret=$?
210 fi
211 ;;
174 "rem-int-dep") 212 "rem-int-dep")
175 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 213 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
176 ret=$? 214 ret=$?
177 ;; 215 ;;
178 "fix-relink") 216 "fix-relink")
187 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then 225 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
188 ELT_walk_patches "${x}/ltmain.sh" "${y}" 226 ELT_walk_patches "${x}/ltmain.sh" "${y}"
189 ret=$? 227 ret=$?
190 fi 228 fi
191 ;; 229 ;;
230 "uclibc-conf")
231 if [[ -e ${x}/configure && \
232 -n $(grep 'Transform linux' "${x}/configure") ]] ; then
233 ELT_walk_patches "${x}/configure" "${y}"
234 ret=$?
235 # ltmain.sh and co might be in a subdirectory ...
236 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
237 -n $(grep 'Transform linux' "${x}/../configure") ]] ; then
238 ELT_walk_patches "${x}/../configure" "${y}"
239 ret=$?
240 fi
241 ;;
242 "uclibc-ltconf")
243 # Newer libtoolize clears ltconfig, as not used anymore
244 if [[ -s ${x}/ltconfig ]] ; then
245 ELT_walk_patches "${x}/ltconfig" "${y}"
246 ret=$?
247 fi
248 ;;
249 "fbsd-conf")
250 if [[ -e ${x}/configure && \
251 -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then
252 ELT_walk_patches "${x}/configure" "${y}"
253 ret=$?
254 # ltmain.sh and co might be in a subdirectory ...
255 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
256 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
257 ELT_walk_patches "${x}/../configure" "${y}"
258 ret=$?
259 fi
260 ;;
261 "darwin-ltconf")
262 # Newer libtoolize clears ltconfig, as not used anymore
263 if [[ -s ${x}/ltconfig ]] ; then
264 ELT_walk_patches "${x}/ltconfig" "${y}"
265 ret=$?
266 fi
267 ;;
192 *) 268 *)
193 ELT_walk_patches "${x}/ltmain.sh" "${y}" 269 ELT_walk_patches "${x}/ltmain.sh" "${y}"
194 ret=$? 270 ret=$?
195 ;; 271 ;;
196 esac 272 esac
197 273
198 if [[ ${ret} -ne 0 ]] ; then 274 if [[ ${ret} -ne 0 ]] ; then
199 case ${y} in 275 case ${y} in
200 "relink") 276 "relink")
277 local version=$(ELT_libtool_version "${x}/ltmain.sh")
201 # Critical patch, but could be applied ... 278 # Critical patch, but could be applied ...
279 # FIXME: Still need a patch for ltmain.sh > 1.4.0
202 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then 280 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \
281 $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
203 ewarn " Could not apply relink.patch!" 282 ewarn " Could not apply relink.patch!"
204 fi 283 fi
205 ;; 284 ;;
206 "portage") 285 "portage")
207 # Critical patch - for this one we abort, as it can really 286 # Critical patch - for this one we abort, as it can really
209 if [[ ${do_portage} == "yes" ]] ; then 288 if [[ ${do_portage} == "yes" ]] ; then
210 # Stupid test to see if its already applied ... 289 # Stupid test to see if its already applied ...
211 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 290 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
212 echo 291 echo
213 eerror "Portage patch requested, but failed to apply!" 292 eerror "Portage patch requested, but failed to apply!"
293 eerror "Please bug azarah or vapier to add proper patch."
214 die "Portage patch requested, but failed to apply!" 294 die "Portage patch requested, but failed to apply!"
215 fi 295 fi
216 else 296 else
217 ewarn " Could not apply portage.patch!" 297 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
298 # ewarn " Portage patch seems to be already applied."
218 ewarn " Please verify that it is not needed." 299 # ewarn " Please verify that it is not needed."
300 :
301 else
302 local version=$( \
303 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
304 echo "${VERSION}")
305
306 echo
307 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
308 eerror "Please bug azarah or vapier to add proper patch."
309 die "Portage patch failed to apply!"
310 fi
311 # We do not want to run libtoolize ...
312 ELT_APPLIED_PATCHES="portage"
219 fi 313 fi
314 ;;
315 "uclibc-"*)
316 [[ ${CHOST} == *"-uclibc" ]] && \
317 ewarn " uClibc patch set '${y}' failed to apply!"
318 ;;
319 "fbsd-"*)
320 if [[ ${CHOST} == *"-freebsd"* ]] ; then
321 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
322 "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then
323 eerror " FreeBSD patch set '${y}' failed to apply!"
324 die "FreeBSD patch set '${y}' failed to apply!"
325 fi
326 fi
327 ;;
328 "darwin-"*)
329 useq ppc-macos && \
330 ewarn " Darwin patch set '${y}' failed to apply!"
220 ;; 331 ;;
221 esac 332 esac
222 fi 333 fi
334 done
223 335
224 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then 336 if [[ -z ${ELT_APPLIED_PATCHES} ]] ; then
225 if [[ ${do_portage} == "no" && \ 337 if [[ ${do_portage} == "no" && \
226 ${do_reversedeps} == "no" && \ 338 ${do_reversedeps} == "no" && \
227 ${do_only_patches} == "no" && \ 339 ${do_only_patches} == "no" && \
228 ${deptoremove} == "" ]] 340 ${deptoremove} == "" ]]
229 then 341 then
342 ewarn "Cannot apply any patches, please file a bug about this"
343 break
344
230 # Sometimes ltmain.sh is in a subdirectory ... 345 # Sometimes ltmain.sh is in a subdirectory ...
231 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then 346 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
232 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then 347 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
233 cd "${x}"/../ 348 cd "${x}"/../
234 fi 349 fi
235 fi
236
237 if type -p libtoolize &> /dev/null ; then
238 ewarn "Cannot apply any patch, running libtoolize..."
239 libtoolize --copy --force
240 fi
241 cd "${x}"
242 break
243 fi 350 fi
351
352 if type -p libtoolize &> /dev/null ; then
353 ewarn "Cannot apply any patches, running libtoolize..."
354 libtoolize --copy --force
355 fi
356 cd "${x}"
357 break
244 fi 358 fi
245 done 359 fi
360
361 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
362
363 touch "${x}/.elibtoolized"
246 done 364 done
247 365
248 if [[ -f libtool ]] ; then 366 cd "${start_dir}"
249 rm -f libtool 367}
368
369uclibctoolize() {
370 ewarn "uclibctoolize() is depreciated, please just use elibtoolize()!"
371 elibtoolize
372}
373
374darwintoolize() {
375 ewarn "darwintoolize() is depreciated, please just use elibtoolize()!"
376 elibtoolize
377}
378
379# char *VER_major(string)
380#
381# Return the Major (X of X.Y.Z) version
382#
383VER_major() {
384 [[ -z $1 ]] && return 1
385
386 local VER=$@
387 echo "${VER%%[^[:digit:]]*}"
388}
389
390# char *VER_minor(string)
391#
392# Return the Minor (Y of X.Y.Z) version
393#
394VER_minor() {
395 [[ -z $1 ]] && return 1
396
397 local VER=$@
398 VER=${VER#*.}
399 echo "${VER%%[^[:digit:]]*}"
400}
401
402# char *VER_micro(string)
403#
404# Return the Micro (Z of X.Y.Z) version.
405#
406VER_micro() {
407 [[ -z $1 ]] && return 1
408
409 local VER=$@
410 VER=${VER#*.*.}
411 echo "${VER%%[^[:digit:]]*}"
412}
413
414# int VER_to_int(string)
415#
416# Convert a string type version (2.4.0) to an int (132096)
417# for easy compairing or versions ...
418#
419VER_to_int() {
420 [[ -z $1 ]] && return 1
421
422 local VER_MAJOR=$(VER_major "$1")
423 local VER_MINOR=$(VER_minor "$1")
424 local VER_MICRO=$(VER_micro "$1")
425 local VER_int=$(( VER_MAJOR * 65536 + VER_MINOR * 256 + VER_MICRO ))
426
427 # We make version 1.0.0 the minimum version we will handle as
428 # a sanity check ... if its less, we fail ...
429 if [[ ${VER_int} -ge 65536 ]] ; then
430 echo "${VER_int}"
431 return 0
250 fi 432 fi
251 433
252 cd "${start_dir}" 434 echo 1
253 435 return 1
254 uclibctoolize
255} 436}
256
257uclibctoolize() {
258 [[ -n ${NO_UCLIBCTOOLIZE} ]] && return 0
259
260 local errmsg=""
261 [[ ${CTARGET:-${CHOST}} == *-uclibc ]] \
262 && errmsg="PLEASE CHECK" \
263 || errmsg="Already patched"
264 local targets=""
265 local x
266
267 if [[ -z $* ]] ; then
268 targets=$(find ${S} -name configure -o -name ltconfig)
269 fi
270
271 einfo "Applying uClibc/libtool patches ..."
272 for x in ${targets} ; do
273 [[ ! -s ${x} ]] && continue
274 case ${x##*/} in
275 configure)
276 if grep 'Transform linux' "${x}" > /dev/null ; then
277 ebegin " Fixing \${S}${x/${S}}"
278 patch -p0 "${x}" "${ELT_PATCH_DIR}/uclibc/configure.patch" > /dev/null
279 eend $? "${errmsg} ${x}"
280 fi
281 ;;
282
283 ltconfig)
284 local ver=$(grep '^VERSION=' ${x})
285 ver=${ver/VERSION=}
286 [[ ${ver:0:3} == "1.4" ]] && ver="1.3" # 1.4 and 1.3 are compat
287 ebegin " Fixing \${S}${x/${S}}"
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
316 eend $? "PLEASE CHECK ${x}"
317 ;;
318 esac
319 done
320}

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

  ViewVC Help
Powered by ViewVC 1.1.20