/[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.77
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.77 2007/09/14 06:49:45 uberlord 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
23ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches" 18ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
24ELT_APPLIED_PATCHES= 19ELT_APPLIED_PATCHES=
25ELT_LTMAIN_SH= 20ELT_LTMAIN_SH=
26 21
27# 22#
28# Returns all the directories containing ltmain.sh 23# Returns all the directories containing ltmain.sh
… …
84 local ret=1 79 local ret=1
85 local file=$1 80 local file=$1
86 local patch_set=$2 81 local patch_set=$2
87 local patch_dir= 82 local patch_dir=
88 local rem_int_dep=$3 83 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 84
95 if [[ -n ${patch_set} ]] ; then 85 if [[ -n ${patch_set} ]] ; then
96 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then 86 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then
97 patch_dir="${ELT_PATCH_DIR}/${patch_set}" 87 patch_dir="${ELT_PATCH_DIR}/${patch_set}"
98 else 88 else
99 return "${ret}" 89 return "${ret}"
100 fi 90 fi
101 91
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) 92 # 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 93 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | grep -v 'CVS' | sort -r) ; do
109 if [[ -n ${x} && -f ${x} ]] ; then 94 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 ... 95 # For --remove-internal-dep ...
116 if [[ -n ${rem_int_dep} ]] ; then 96 if [[ -n ${rem_int_dep} ]] ; then
117 # For replace @REM_INT_DEP@ with what was passed 97 # For replace @REM_INT_DEP@ with what was passed
118 # to --remove-internal-dep 98 # to --remove-internal-dep
119 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \ 99 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
… …
140 local do_reversedeps="no" 120 local do_reversedeps="no"
141 local do_only_patches="no" 121 local do_only_patches="no"
142 local do_uclibc="yes" 122 local do_uclibc="yes"
143 local deptoremove= 123 local deptoremove=
144 local my_dirlist= 124 local my_dirlist=
145 local elt_patches="portage relink max_cmd_len sed test tmp" 125 local elt_patches="ltmain portage relink max_cmd_len sed test tmp"
146 local start_dir=${PWD} 126 local start_dir=${PWD}
147 127
148 my_dirlist=$(ELT_find_ltmain_sh) 128 my_dirlist=$(ELT_find_ltmain_sh)
149 129
150 for x in "$@" ; do 130 for x in "$@" ; do
… …
191 171
192 [[ ${do_uclibc} == "yes" ]] && \ 172 [[ ${do_uclibc} == "yes" ]] && \
193 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf" 173 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
194 174
195 [[ ${CHOST} == *"-freebsd"* ]] && \ 175 [[ ${CHOST} == *"-freebsd"* ]] && \
196 elt_patches="${elt_patches} fbsd-conf" 176 elt_patches="${elt_patches} fbsd-conf fbsd-ltconf"
197 177
198 if useq ppc-macos ; then 178 [[ ${CHOST} == *"-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" 179 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
204 fi
205 180
206 for x in ${my_dirlist} ; do 181 for x in ${my_dirlist} ; do
207 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||") 182 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
208 export ELT_APPLIED_PATCHES= 183 export ELT_APPLIED_PATCHES=
209 export ELT_LTMAIN_SH="${x}/ltmain.sh" 184 export ELT_LTMAIN_SH="${x}/ltmain.sh"
… …
215 190
216 for y in ${elt_patches} ; do 191 for y in ${elt_patches} ; do
217 local ret=0 192 local ret=0
218 193
219 case "${y}" in 194 case "${y}" in
195 "portage")
196 # Stupid test to see if its already applied ...
197 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
198 ELT_walk_patches "${x}/ltmain.sh" "${y}"
199 ret=$?
200 fi
201 ;;
220 "rem-int-dep") 202 "rem-int-dep")
221 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 203 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
222 ret=$? 204 ret=$?
223 ;; 205 ;;
224 "fix-relink") 206 "fix-relink")
… …
261 ret=$? 243 ret=$?
262 # ltmain.sh and co might be in a subdirectory ... 244 # ltmain.sh and co might be in a subdirectory ...
263 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \ 245 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
264 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then 246 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
265 ELT_walk_patches "${x}/../configure" "${y}" 247 ELT_walk_patches "${x}/../configure" "${y}"
248 ret=$?
249 fi
250 ;;
251 "fbsd-ltconf")
252 if [[ -s ${x}/ltconfig ]] ; then
253 ELT_walk_patches "${x}/ltconfig" "${y}"
266 ret=$? 254 ret=$?
267 fi 255 fi
268 ;; 256 ;;
269 "darwin-ltconf") 257 "darwin-ltconf")
270 # Newer libtoolize clears ltconfig, as not used anymore 258 # Newer libtoolize clears ltconfig, as not used anymore
… …
296 if [[ ${do_portage} == "yes" ]] ; then 284 if [[ ${do_portage} == "yes" ]] ; then
297 # Stupid test to see if its already applied ... 285 # Stupid test to see if its already applied ...
298 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 286 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
299 echo 287 echo
300 eerror "Portage patch requested, but failed to apply!" 288 eerror "Portage patch requested, but failed to apply!"
289 eerror "Please bug azarah or vapier to add proper patch."
301 die "Portage patch requested, but failed to apply!" 290 die "Portage patch requested, but failed to apply!"
302 fi 291 fi
303 else 292 else
304 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 293 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
305 # ewarn " Portage patch seems to be already applied." 294 # ewarn " Portage patch seems to be already applied."
… …
310 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \ 299 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
311 echo "${VERSION}") 300 echo "${VERSION}")
312 301
313 echo 302 echo
314 eerror "Portage patch failed to apply (ltmain.sh version ${version})!" 303 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
304 eerror "Please bug azarah or vapier to add proper patch."
315 die "Portage patch failed to apply!" 305 die "Portage patch failed to apply!"
316 fi 306 fi
317 # We do not want to run libtoolize ... 307 # We do not want to run libtoolize ...
318 ELT_APPLIED_PATCHES="portage" 308 ELT_APPLIED_PATCHES="portage"
319 fi 309 fi
… …
322 [[ ${CHOST} == *"-uclibc" ]] && \ 312 [[ ${CHOST} == *"-uclibc" ]] && \
323 ewarn " uClibc patch set '${y}' failed to apply!" 313 ewarn " uClibc patch set '${y}' failed to apply!"
324 ;; 314 ;;
325 "fbsd-"*) 315 "fbsd-"*)
326 if [[ ${CHOST} == *"-freebsd"* ]] ; then 316 if [[ ${CHOST} == *"-freebsd"* ]] ; then
327 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' "${x}/configure") ]]; then 317 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
318 "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then
328 eerror " FreeBSD patch set '${y}' failed to apply!" 319 eerror " FreeBSD patch set '${y}' failed to apply!"
329 die "FreeBSD patch set '${y}' failed to apply!" 320 die "FreeBSD patch set '${y}' failed to apply!"
330 fi 321 fi
331 fi 322 fi
332 ;; 323 ;;
333 "darwin-"*) 324 "darwin-"*)
334 useq ppc-macos && \ 325 [[ ${CHOST} == *"-darwin"* ]] && \
335 ewarn " Darwin patch set '${y}' failed to apply!" 326 ewarn " Darwin patch set '${y}' failed to apply!"
336 ;; 327 ;;
337 esac 328 esac
338 fi 329 fi
339 done 330 done
… …
343 ${do_reversedeps} == "no" && \ 334 ${do_reversedeps} == "no" && \
344 ${do_only_patches} == "no" && \ 335 ${do_only_patches} == "no" && \
345 ${deptoremove} == "" ]] 336 ${deptoremove} == "" ]]
346 then 337 then
347 ewarn "Cannot apply any patches, please file a bug about this" 338 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 339 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 340 fi
364 fi 341 fi
365 342
366 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool" 343 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
367 344
… …
370 347
371 cd "${start_dir}" 348 cd "${start_dir}"
372} 349}
373 350
374uclibctoolize() { 351uclibctoolize() {
375 ewarn "uclibctoolize() is depreciated, please just use elibtoolize()!" 352 ewarn "uclibctoolize() is deprecated, please just use elibtoolize()!"
376 elibtoolize 353 elibtoolize
377} 354}
378 355
379darwintoolize() { 356darwintoolize() {
380 ewarn "darwintoolize() is depreciated, please just use elibtoolize()!" 357 ewarn "darwintoolize() is deprecated, please just use elibtoolize()!"
381 elibtoolize 358 elibtoolize
382} 359}
383 360
384# char *VER_major(string) 361# char *VER_major(string)
385# 362#
Legend:
Removed from v.1.62  
changed lines
  Added in v.1.77
  ViewVC Help
Powered by ViewVC 1.1.13