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

Diff of /eclass/libtool.eclass

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

Revision 1.60 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.60 2005/10/04 15:48:05 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
45 local ret=0 42 local ret=0
46 local file=$1 43 local file=$1
47 local patch=$2 44 local patch=$2
48 45
49 # We only support patchlevel of 0 - why worry if its static patches? 46 # We only support patchlevel of 0 - why worry if its static patches?
50 if patch -p0 --dry-run "${file}" < "${patch}" &> "${T}/elibtool.log" ; then 47 if patch -p0 --dry-run "${file}" "${patch}" &> "${T}/elibtool.log" ; then
51 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..." 48 einfo " Applying $(basename "$(dirname "${patch}")")-${patch##*/}.patch ..."
52 patch -p0 "${file}" < "${patch}" &> "${T}/elibtool.log" 49 patch -p0 -g0 --no-backup-if-mismatch "${file}" "${patch}" \
50 &> "${T}/elibtool.log"
53 ret=$? 51 ret=$?
54 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}" 52 export ELT_APPLIED_PATCHES="${ELT_APPLIED_PATCHES} ${patch##*/}"
55 else 53 else
56 ret=1 54 ret=1
57 fi 55 fi
83 local ret=1 81 local ret=1
84 local file=$1 82 local file=$1
85 local patch_set=$2 83 local patch_set=$2
86 local patch_dir= 84 local patch_dir=
87 local rem_int_dep=$3 85 local rem_int_dep=$3
88 local version=
89 local ltmain_sh=$1
90
91 [[ ${file} == *"/configure" ]] && ltmain_sh=${ELT_LTMAIN_SH}
92 version=$(ELT_libtool_version "${ltmain_sh}")
93 86
94 if [[ -n ${patch_set} ]] ; then 87 if [[ -n ${patch_set} ]] ; then
95 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then 88 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then
96 patch_dir="${ELT_PATCH_DIR}/${patch_set}" 89 patch_dir="${ELT_PATCH_DIR}/${patch_set}"
97 else 90 else
98 return "${ret}" 91 return "${ret}"
99 fi 92 fi
100 93
101 if [[ ${version} == "0" ]] ; then
102 eerror "Could not get VERSION for ${file##*/}!"
103 die "Could not get VERSION for ${file##*/}!"
104 fi
105
106 # Go through the patches in reverse order (large to small) 94 # Go through the patches in reverse order (large to small)
107 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | sort -r) ; do 95 for x in $(ls -d "${patch_dir}"/* 2> /dev/null | grep -v 'CVS' | sort -r) ; do
108 if [[ -n ${x} && -f ${x} ]] ; then 96 if [[ -n ${x} && -f ${x} ]] ; then
109 local ltver=$(VER_to_int "${version}")
110 local ptver=$(VER_to_int "${x##*/}")
111
112 # If libtool version smaller than patch version, skip patch.
113 [[ ${ltver} -lt ${ptver} ]] && continue
114 # For --remove-internal-dep ... 97 # For --remove-internal-dep ...
115 if [[ -n ${rem_int_dep} ]] ; then 98 if [[ -n ${rem_int_dep} ]] ; then
116 # For replace @REM_INT_DEP@ with what was passed 99 # For replace @REM_INT_DEP@ with what was passed
117 # to --remove-internal-dep 100 # to --remove-internal-dep
118 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \ 101 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
139 local do_reversedeps="no" 122 local do_reversedeps="no"
140 local do_only_patches="no" 123 local do_only_patches="no"
141 local do_uclibc="yes" 124 local do_uclibc="yes"
142 local deptoremove= 125 local deptoremove=
143 local my_dirlist= 126 local my_dirlist=
144 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"
145 local start_dir=${PWD} 128 local start_dir=${PWD}
146 129
147 my_dirlist=$(ELT_find_ltmain_sh) 130 my_dirlist=$(ELT_find_ltmain_sh)
148 131
149 for x in "$@" ; do 132 for x in "$@" ; do
190 173
191 [[ ${do_uclibc} == "yes" ]] && \ 174 [[ ${do_uclibc} == "yes" ]] && \
192 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf" 175 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
193 176
194 [[ ${CHOST} == *"-freebsd"* ]] && \ 177 [[ ${CHOST} == *"-freebsd"* ]] && \
195 elt_patches="${elt_patches} fbsd-conf" 178 elt_patches="${elt_patches} fbsd-conf fbsd-ltconf"
196 179
197 if useq ppc-macos ; then 180 [[ ${CHOST} == *"-darwin"* ]] && \
198 local opts
199 [[ -f Makefile.am ]] && opts="--automake"
200 glibtoolize --copy --force ${opts}
201
202 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain" 181 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
203 fi
204 182
205 for x in ${my_dirlist} ; do 183 for x in ${my_dirlist} ; do
206 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||") 184 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
207 export ELT_APPLIED_PATCHES= 185 export ELT_APPLIED_PATCHES=
208 export ELT_LTMAIN_SH="${x}/ltmain.sh" 186 export ELT_LTMAIN_SH="${x}/ltmain.sh"
214 192
215 for y in ${elt_patches} ; do 193 for y in ${elt_patches} ; do
216 local ret=0 194 local ret=0
217 195
218 case "${y}" in 196 case "${y}" in
197 "portage")
198 # Stupid test to see if its already applied ...
199 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
200 ELT_walk_patches "${x}/ltmain.sh" "${y}"
201 ret=$?
202 fi
203 ;;
219 "rem-int-dep") 204 "rem-int-dep")
220 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 205 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
221 ret=$? 206 ret=$?
222 ;; 207 ;;
223 "fix-relink") 208 "fix-relink")
232 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then 217 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
233 ELT_walk_patches "${x}/ltmain.sh" "${y}" 218 ELT_walk_patches "${x}/ltmain.sh" "${y}"
234 ret=$? 219 ret=$?
235 fi 220 fi
236 ;; 221 ;;
222 "as-needed")
223 ELT_walk_patches "${x}/ltmain.sh" "${y}"
224 ret=$?
225 ;;
237 "uclibc-conf") 226 "uclibc-conf")
238 if [[ -e ${x}/configure && \ 227 if [[ -e ${x}/configure && \
239 -n $(grep 'Transform linux' "${x}/configure") ]] ; then 228 -n $(grep 'Transform linux' "${x}/configure") ]] ; then
240 ELT_walk_patches "${x}/configure" "${y}" 229 ELT_walk_patches "${x}/configure" "${y}"
241 ret=$? 230 ret=$?
263 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then 252 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
264 ELT_walk_patches "${x}/../configure" "${y}" 253 ELT_walk_patches "${x}/../configure" "${y}"
265 ret=$? 254 ret=$?
266 fi 255 fi
267 ;; 256 ;;
257 "fbsd-ltconf")
258 if [[ -s ${x}/ltconfig ]] ; then
259 ELT_walk_patches "${x}/ltconfig" "${y}"
260 ret=$?
261 fi
262 ;;
268 "darwin-ltconf") 263 "darwin-ltconf")
269 # Newer libtoolize clears ltconfig, as not used anymore 264 # Newer libtoolize clears ltconfig, as not used anymore
270 if [[ -s ${x}/ltconfig ]] ; then 265 if [[ -s ${x}/ltconfig ]] ; then
271 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}"
272 ret=$? 277 ret=$?
273 fi 278 fi
274 ;; 279 ;;
275 *) 280 *)
276 ELT_walk_patches "${x}/ltmain.sh" "${y}" 281 ELT_walk_patches "${x}/ltmain.sh" "${y}"
295 if [[ ${do_portage} == "yes" ]] ; then 300 if [[ ${do_portage} == "yes" ]] ; then
296 # Stupid test to see if its already applied ... 301 # Stupid test to see if its already applied ...
297 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 302 if [[ -z $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
298 echo 303 echo
299 eerror "Portage patch requested, but failed to apply!" 304 eerror "Portage patch requested, but failed to apply!"
305 eerror "Please bug azarah or vapier to add proper patch."
300 die "Portage patch requested, but failed to apply!" 306 die "Portage patch requested, but failed to apply!"
301 fi 307 fi
302 else 308 else
303 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then 309 if [[ -n $(grep 'We do not want portage' "${x}/ltmain.sh") ]] ; then
304 # ewarn " Portage patch seems to be already applied." 310 # ewarn " Portage patch seems to be already applied."
309 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \ 315 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
310 echo "${VERSION}") 316 echo "${VERSION}")
311 317
312 echo 318 echo
313 eerror "Portage patch failed to apply (ltmain.sh version ${version})!" 319 eerror "Portage patch failed to apply (ltmain.sh version ${version})!"
320 eerror "Please bug azarah or vapier to add proper patch."
314 die "Portage patch failed to apply!" 321 die "Portage patch failed to apply!"
315 fi 322 fi
316 # We do not want to run libtoolize ... 323 # We do not want to run libtoolize ...
317 ELT_APPLIED_PATCHES="portage" 324 ELT_APPLIED_PATCHES="portage"
318 fi 325 fi
321 [[ ${CHOST} == *"-uclibc" ]] && \ 328 [[ ${CHOST} == *"-uclibc" ]] && \
322 ewarn " uClibc patch set '${y}' failed to apply!" 329 ewarn " uClibc patch set '${y}' failed to apply!"
323 ;; 330 ;;
324 "fbsd-"*) 331 "fbsd-"*)
325 if [[ ${CHOST} == *"-freebsd"* ]] ; then 332 if [[ ${CHOST} == *"-freebsd"* ]] ; then
333 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' \
334 "${x}/configure" "${x}/../configure" 2>/dev/null) ]]; then
326 eerror " FreeBSD patch set '${y}' failed to apply!" 335 eerror " FreeBSD patch set '${y}' failed to apply!"
327 die "FreeBSD patch set '${y}' failed to apply!" 336 die "FreeBSD patch set '${y}' failed to apply!"
337 fi
328 fi 338 fi
329 ;; 339 ;;
330 "darwin-"*) 340 "darwin-"*)
331 useq ppc-macos && \ 341 [[ ${CHOST} == *"-darwin"* ]] && \
332 ewarn " Darwin patch set '${y}' failed to apply!" 342 ewarn " Darwin patch set '${y}' failed to apply!"
333 ;; 343 ;;
334 esac 344 esac
335 fi 345 fi
336 done 346 done
340 ${do_reversedeps} == "no" && \ 350 ${do_reversedeps} == "no" && \
341 ${do_only_patches} == "no" && \ 351 ${do_only_patches} == "no" && \
342 ${deptoremove} == "" ]] 352 ${deptoremove} == "" ]]
343 then 353 then
344 ewarn "Cannot apply any patches, please file a bug about this" 354 ewarn "Cannot apply any patches, please file a bug about this"
345 break
346
347 # Sometimes ltmain.sh is in a subdirectory ...
348 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
349 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
350 cd "${x}"/../
351 fi
352 fi 355 die
353
354 if type -p libtoolize &> /dev/null ; then
355 ewarn "Cannot apply any patches, running libtoolize..."
356 libtoolize --copy --force
357 fi
358 cd "${x}"
359 break
360 fi 356 fi
361 fi 357 fi
362 358
363 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool" 359 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
364 360
365 touch "${x}/.elibtoolized" 361 >> "${x}/.elibtoolized"
366 done 362 done
367 363
368 cd "${start_dir}" 364 cd "${start_dir}"
369} 365}
370 366
371uclibctoolize() { 367uclibctoolize() {
372 ewarn "uclibctoolize() is depreciated, please just use elibtoolize()!" 368 ewarn "uclibctoolize() is deprecated, please just use elibtoolize()!"
373 elibtoolize 369 elibtoolize
374} 370}
375 371
376darwintoolize() { 372darwintoolize() {
377 ewarn "darwintoolize() is depreciated, please just use elibtoolize()!" 373 ewarn "darwintoolize() is deprecated, please just use elibtoolize()!"
378 elibtoolize 374 elibtoolize
379} 375}
380 376
381# char *VER_major(string) 377# char *VER_major(string)
382# 378#

Legend:
Removed from v.1.60  
changed lines
  Added in v.1.83

  ViewVC Help
Powered by ViewVC 1.1.20