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

Diff of /eclass/libtool.eclass

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

Revision 1.64 Revision 1.83
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.64 2006/02/03 22:20:25 azarah Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.83 2009/05/03 20:03:10 loki_val 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
18inherit toolchain-funcs
19
23ELT_PATCH_DIR="${PORTDIR}/eclass/ELT-patches" 20ELT_PATCH_DIR="${ECLASSDIR}/ELT-patches"
24ELT_APPLIED_PATCHES= 21ELT_APPLIED_PATCHES=
25ELT_LTMAIN_SH= 22ELT_LTMAIN_SH=
26 23
27# 24#
28# Returns all the directories containing ltmain.sh 25# Returns all the directories containing ltmain.sh
… …
84 local ret=1 81 local ret=1
85 local file=$1 82 local file=$1
86 local patch_set=$2 83 local patch_set=$2
87 local patch_dir= 84 local patch_dir=
88 local rem_int_dep=$3 85 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 86
95 if [[ -n ${patch_set} ]] ; then 87 if [[ -n ${patch_set} ]] ; then
96 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then 88 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then
97 patch_dir="${ELT_PATCH_DIR}/${patch_set}" 89 patch_dir="${ELT_PATCH_DIR}/${patch_set}"
98 else 90 else
99 return "${ret}" 91 return "${ret}"
100 fi 92 fi
101 93
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) 94 # 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 95 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | grep -v 'CVS' | sort -r) ; do
109 if [[ -n ${x} && -f ${x} ]] ; then 96 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 ... 97 # For --remove-internal-dep ...
116 if [[ -n ${rem_int_dep} ]] ; then 98 if [[ -n ${rem_int_dep} ]] ; then
117 # For replace @REM_INT_DEP@ with what was passed 99 # For replace @REM_INT_DEP@ with what was passed
118 # to --remove-internal-dep 100 # to --remove-internal-dep
119 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \ 101 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
… …
140 local do_reversedeps="no" 122 local do_reversedeps="no"
141 local do_only_patches="no" 123 local do_only_patches="no"
142 local do_uclibc="yes" 124 local do_uclibc="yes"
143 local deptoremove= 125 local deptoremove=
144 local my_dirlist= 126 local my_dirlist=
145 local elt_patches="portage relink max_cmd_len sed test tmp" 127 local elt_patches="install-sh ltmain portage relink max_cmd_len sed test tmp cross as-needed"
146 local start_dir=${PWD} 128 local start_dir=${PWD}
147 129
148 my_dirlist=$(ELT_find_ltmain_sh) 130 my_dirlist=$(ELT_find_ltmain_sh)
149 131
150 for x in "$@" ; do 132 for x in "$@" ; do
… …
191 173
192 [[ ${do_uclibc} == "yes" ]] && \ 174 [[ ${do_uclibc} == "yes" ]] && \
193 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf" 175 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
194 176
195 [[ ${CHOST} == *"-freebsd"* ]] && \ 177 [[ ${CHOST} == *"-freebsd"* ]] && \
196 elt_patches="${elt_patches} fbsd-conf" 178 elt_patches="${elt_patches} fbsd-conf fbsd-ltconf"
197 179
198 if useq ppc-macos ; then 180 [[ ${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" 181 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
204 fi
205 182
206 for x in ${my_dirlist} ; do 183 for x in ${my_dirlist} ; do
207 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||") 184 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
208 export ELT_APPLIED_PATCHES= 185 export ELT_APPLIED_PATCHES=
209 export ELT_LTMAIN_SH="${x}/ltmain.sh" 186 export ELT_LTMAIN_SH="${x}/ltmain.sh"
… …
240 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then 217 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
241 ELT_walk_patches "${x}/ltmain.sh" "${y}" 218 ELT_walk_patches "${x}/ltmain.sh" "${y}"
242 ret=$? 219 ret=$?
243 fi 220 fi
244 ;; 221 ;;
222 "as-needed")
223 ELT_walk_patches "${x}/ltmain.sh" "${y}"
224 ret=$?
225 ;;
245 "uclibc-conf") 226 "uclibc-conf")
246 if [[ -e ${x}/configure && \ 227 if [[ -e ${x}/configure && \
247 -n $(grep 'Transform linux' "${x}/configure") ]] ; then 228 -n $(grep 'Transform linux' "${x}/configure") ]] ; then
248 ELT_walk_patches "${x}/configure" "${y}" 229 ELT_walk_patches "${x}/configure" "${y}"
249 ret=$? 230 ret=$?
… …
271 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then 252 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
272 ELT_walk_patches "${x}/../configure" "${y}" 253 ELT_walk_patches "${x}/../configure" "${y}"
273 ret=$? 254 ret=$?
274 fi 255 fi
275 ;; 256 ;;
257 "fbsd-ltconf")
258 if [[ -s ${x}/ltconfig ]] ; then
259 ELT_walk_patches "${x}/ltconfig" "${y}"
260 ret=$?
261 fi
262 ;;
276 "darwin-ltconf") 263 "darwin-ltconf")
277 # Newer libtoolize clears ltconfig, as not used anymore 264 # Newer libtoolize clears ltconfig, as not used anymore
278 if [[ -s ${x}/ltconfig ]] ; then 265 if [[ -s ${x}/ltconfig ]] ; then
279 ELT_walk_patches "${x}/ltconfig" "${y}" 266 ELT_walk_patches "${x}/ltconfig" "${y}"
267 ret=$?
268 fi
269 ;;
270 "install-sh")
271 ELT_walk_patches "${x}/install-sh" "${y}"
272 ret=$?
273 ;;
274 "cross")
275 if tc-is-cross-compiler ; then
276 ELT_walk_patches "${x}/ltmain.sh" "${y}"
280 ret=$? 277 ret=$?
281 fi 278 fi
282 ;; 279 ;;
283 *) 280 *)
284 ELT_walk_patches "${x}/ltmain.sh" "${y}" 281 ELT_walk_patches "${x}/ltmain.sh" "${y}"
… …
331 [[ ${CHOST} == *"-uclibc" ]] && \ 328 [[ ${CHOST} == *"-uclibc" ]] && \
332 ewarn " uClibc patch set '${y}' failed to apply!" 329 ewarn " uClibc patch set '${y}' failed to apply!"
333 ;; 330 ;;
334 "fbsd-"*) 331 "fbsd-"*)
335 if [[ ${CHOST} == *"-freebsd"* ]] ; then 332 if [[ ${CHOST} == *"-freebsd"* ]] ; then
336 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' "${x}/configure") ]]; then 333 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
334 "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then
337 eerror " FreeBSD patch set '${y}' failed to apply!" 335 eerror " FreeBSD patch set '${y}' failed to apply!"
338 die "FreeBSD patch set '${y}' failed to apply!" 336 die "FreeBSD patch set '${y}' failed to apply!"
339 fi 337 fi
340 fi 338 fi
341 ;; 339 ;;
342 "darwin-"*) 340 "darwin-"*)
343 useq ppc-macos && \ 341 [[ ${CHOST} == *"-darwin"* ]] && \
344 ewarn " Darwin patch set '${y}' failed to apply!" 342 ewarn " Darwin patch set '${y}' failed to apply!"
345 ;; 343 ;;
346 esac 344 esac
347 fi 345 fi
348 done 346 done
… …
352 ${do_reversedeps} == "no" && \ 350 ${do_reversedeps} == "no" && \
353 ${do_only_patches} == "no" && \ 351 ${do_only_patches} == "no" && \
354 ${deptoremove} == "" ]] 352 ${deptoremove} == "" ]]
355 then 353 then
356 ewarn "Cannot apply any patches, please file a bug about this" 354 ewarn "Cannot apply any patches, please file a bug about this"
357 break
358
359 # Sometimes ltmain.sh is in a subdirectory ...
360 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
361 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
362 cd "${x}"/../
363 fi
364 fi 355 die
365
366 if type -p libtoolize &> /dev/null ; then
367 ewarn "Cannot apply any patches, running libtoolize..."
368 libtoolize --copy --force
369 fi
370 cd "${x}"
371 break
372 fi 356 fi
373 fi 357 fi
374 358
375 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool" 359 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
376 360
377 touch "${x}/.elibtoolized" 361 >> "${x}/.elibtoolized"
378 done 362 done
379 363
380 cd "${start_dir}" 364 cd "${start_dir}"
381} 365}
382 366
383uclibctoolize() { 367uclibctoolize() {
384 ewarn "uclibctoolize() is depreciated, please just use elibtoolize()!" 368 ewarn "uclibctoolize() is deprecated, please just use elibtoolize()!"
385 elibtoolize 369 elibtoolize
386} 370}
387 371
388darwintoolize() { 372darwintoolize() {
389 ewarn "darwintoolize() is depreciated, please just use elibtoolize()!" 373 ewarn "darwintoolize() is deprecated, please just use elibtoolize()!"
390 elibtoolize 374 elibtoolize
391} 375}
392 376
393# char *VER_major(string) 377# char *VER_major(string)
394# 378#
Legend:
Removed from v.1.64  
changed lines
  Added in v.1.83
  ViewVC Help
Powered by ViewVC 1.1.17