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

Diff of /eclass/libtool.eclass

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

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

Legend:
Removed from v.1.34  
changed lines
  Added in v.1.62

  ViewVC Help
Powered by ViewVC 1.1.20