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

Diff of /eclass/libtool.eclass

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

Revision 1.58 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.58 2005/09/04 20:45:57 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
58 56
59 return "${ret}" 57 return "${ret}"
58}
59
60#
61# Get string version of ltmain.sh or ltconfig (passed as $1)
62#
63ELT_libtool_version() {
64 local ltmain_sh=$1
65 local version=
66
67 version=$(eval $(grep -e '^[[:space:]]*VERSION=' "${ltmain_sh}"); \
68 echo "${VERSION}")
69 [[ -z ${version} ]] && version="0"
70
71 echo "${version}"
60} 72}
61 73
62# 74#
63# Run through the patches in $2 and see if any 75# Run through the patches in $2 and see if any
64# apply to $1 ... 76# apply to $1 ...
… …
69 local ret=1 81 local ret=1
70 local file=$1 82 local file=$1
71 local patch_set=$2 83 local patch_set=$2
72 local patch_dir= 84 local patch_dir=
73 local rem_int_dep=$3 85 local rem_int_dep=$3
74 local version=
75 local ltmain_sh=$1
76
77 [[ ${file} == *"/configure" ]] && ltmain_sh=${ELT_LTMAIN_SH}
78 version=$(eval $(grep -e '^[[:space:]]*VERSION=' "${ltmain_sh}"); \
79 echo "${VERSION}")
80 86
81 if [[ -n ${patch_set} ]] ; then 87 if [[ -n ${patch_set} ]] ; then
82 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then 88 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then
83 patch_dir="${ELT_PATCH_DIR}/${patch_set}" 89 patch_dir="${ELT_PATCH_DIR}/${patch_set}"
84 else 90 else
85 return "${ret}" 91 return "${ret}"
86 fi 92 fi
87 93
88 if [[ -z ${version} ]] ; then
89 eerror "Could not get VERSION for ${file##*/}!"
90 die "Could not get VERSION for ${file##*/}!"
91 fi
92
93 # Go through the patches in reverse order (large to small) 94 # Go through the patches in reverse order (large to small)
94 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
95 if [[ -n ${x} && -f ${x} ]] ; then 96 if [[ -n ${x} && -f ${x} ]] ; then
96 local ltver=$(VER_to_int "${version}")
97 local ptver=$(VER_to_int "${x##*/}")
98
99 # If libtool version smaller than patch version, skip patch.
100 [[ ${ltver} -lt ${ptver} ]] && continue
101 # For --remove-internal-dep ... 97 # For --remove-internal-dep ...
102 if [[ -n ${rem_int_dep} ]] ; then 98 if [[ -n ${rem_int_dep} ]] ; then
103 # For replace @REM_INT_DEP@ with what was passed 99 # For replace @REM_INT_DEP@ with what was passed
104 # to --remove-internal-dep 100 # to --remove-internal-dep
105 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \ 101 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
… …
126 local do_reversedeps="no" 122 local do_reversedeps="no"
127 local do_only_patches="no" 123 local do_only_patches="no"
128 local do_uclibc="yes" 124 local do_uclibc="yes"
129 local deptoremove= 125 local deptoremove=
130 local my_dirlist= 126 local my_dirlist=
131 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"
132 local start_dir=${PWD} 128 local start_dir=${PWD}
133 129
134 my_dirlist=$(ELT_find_ltmain_sh) 130 my_dirlist=$(ELT_find_ltmain_sh)
135 131
136 for x in "$@" ; do 132 for x in "$@" ; do
… …
177 173
178 [[ ${do_uclibc} == "yes" ]] && \ 174 [[ ${do_uclibc} == "yes" ]] && \
179 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf" 175 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
180 176
181 [[ ${CHOST} == *"-freebsd"* ]] && \ 177 [[ ${CHOST} == *"-freebsd"* ]] && \
182 elt_patches="${elt_patches} fbsd-conf" 178 elt_patches="${elt_patches} fbsd-conf fbsd-ltconf"
183 179
184 if use ppc-macos ; then 180 [[ ${CHOST} == *"-darwin"* ]] && \
185 local opts 181 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
186 [[ -f Makefile.am ]] && opts="--automake"
187 glibtoolize --copy --force ${opts}
188 darwintoolize
189 fi
190 182
191 for x in ${my_dirlist} ; do 183 for x in ${my_dirlist} ; do
192 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||") 184 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
193 export ELT_APPLIED_PATCHES= 185 export ELT_APPLIED_PATCHES=
194 export ELT_LTMAIN_SH="${x}/ltmain.sh" 186 export ELT_LTMAIN_SH="${x}/ltmain.sh"
… …
200 192
201 for y in ${elt_patches} ; do 193 for y in ${elt_patches} ; do
202 local ret=0 194 local ret=0
203 195
204 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 ;;
205 "rem-int-dep") 204 "rem-int-dep")
206 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}" 205 ELT_walk_patches "${x}/ltmain.sh" "${y}" "${deptoremove}"
207 ret=$? 206 ret=$?
208 ;; 207 ;;
209 "fix-relink") 208 "fix-relink")
… …
218 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then 217 if [[ -n $(grep 'max_cmd_len' "${x}/ltmain.sh") ]] ; then
219 ELT_walk_patches "${x}/ltmain.sh" "${y}" 218 ELT_walk_patches "${x}/ltmain.sh" "${y}"
220 ret=$? 219 ret=$?
221 fi 220 fi
222 ;; 221 ;;
222 "as-needed")
223 ELT_walk_patches "${x}/ltmain.sh" "${y}"
224 ret=$?
225 ;;
223 "uclibc-conf") 226 "uclibc-conf")
224 if [[ -e ${x}/configure && \ 227 if [[ -e ${x}/configure && \
225 -n $(grep 'Transform linux' "${x}/configure") ]] ; then 228 -n $(grep 'Transform linux' "${x}/configure") ]] ; then
226 ELT_walk_patches "${x}/configure" "${y}" 229 ELT_walk_patches "${x}/configure" "${y}"
227 ret=$? 230 ret=$?
… …
231 ELT_walk_patches "${x}/../configure" "${y}" 234 ELT_walk_patches "${x}/../configure" "${y}"
232 ret=$? 235 ret=$?
233 fi 236 fi
234 ;; 237 ;;
235 "uclibc-ltconf") 238 "uclibc-ltconf")
239 # Newer libtoolize clears ltconfig, as not used anymore
236 if [[ -e ${x}/ltconfig ]] ; then 240 if [[ -s ${x}/ltconfig ]] ; then
237 ELT_walk_patches "${x}/ltconfig" "${y}" 241 ELT_walk_patches "${x}/ltconfig" "${y}"
238 ret=$? 242 ret=$?
239 fi 243 fi
240 ;; 244 ;;
241 "fbsd-conf") 245 "fbsd-conf")
… …
248 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then 252 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
249 ELT_walk_patches "${x}/../configure" "${y}" 253 ELT_walk_patches "${x}/../configure" "${y}"
250 ret=$? 254 ret=$?
251 fi 255 fi
252 ;; 256 ;;
257 "fbsd-ltconf")
258 if [[ -s ${x}/ltconfig ]] ; then
259 ELT_walk_patches "${x}/ltconfig" "${y}"
260 ret=$?
261 fi
262 ;;
263 "darwin-ltconf")
264 # Newer libtoolize clears ltconfig, as not used anymore
265 if [[ -s ${x}/ltconfig ]] ; then
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}"
277 ret=$?
278 fi
279 ;;
253 *) 280 *)
254 ELT_walk_patches "${x}/ltmain.sh" "${y}" 281 ELT_walk_patches "${x}/ltmain.sh" "${y}"
255 ret=$? 282 ret=$?
256 ;; 283 ;;
257 esac 284 esac
258 285
259 if [[ ${ret} -ne 0 ]] ; then 286 if [[ ${ret} -ne 0 ]] ; then
260 case ${y} in 287 case ${y} in
261 "relink") 288 "relink")
289 local version=$(ELT_libtool_version "${x}/ltmain.sh")
262 # Critical patch, but could be applied ... 290 # Critical patch, but could be applied ...
291 # FIXME: Still need a patch for ltmain.sh > 1.4.0
263 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") ]] ; then 292 if [[ -z $(grep 'inst_prefix_dir' "${x}/ltmain.sh") && \
293 $(VER_to_int "${version}") -ge $(VER_to_int "1.4.0") ]] ; then
264 ewarn " Could not apply relink.patch!" 294 ewarn " Could not apply relink.patch!"
265 fi 295 fi
266 ;; 296 ;;
267 "portage") 297 "portage")
268 # Critical patch - for this one we abort, as it can really 298 # Critical patch - for this one we abort, as it can really
… …
270 if [[ ${do_portage} == "yes" ]] ; then 300 if [[ ${do_portage} == "yes" ]] ; then
271 # Stupid test to see if its already applied ... 301 # Stupid test to see if its already applied ...
272 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
273 echo 303 echo
274 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."
275 die "Portage patch requested, but failed to apply!" 306 die "Portage patch requested, but failed to apply!"
276 fi 307 fi
277 else 308 else
278 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
279 # ewarn " Portage patch seems to be already applied." 310 # ewarn " Portage patch seems to be already applied."
… …
284 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \ 315 eval $(grep -e '^[[:space:]]*VERSION=' "${x}/ltmain.sh"); \
285 echo "${VERSION}") 316 echo "${VERSION}")
286 317
287 echo 318 echo
288 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."
289 die "Portage patch failed to apply!" 321 die "Portage patch failed to apply!"
290 fi 322 fi
291 # We do not want to run libtoolize ... 323 # We do not want to run libtoolize ...
292 ELT_APPLIED_PATCHES="portage" 324 ELT_APPLIED_PATCHES="portage"
293 fi 325 fi
… …
295 "uclibc-"*) 327 "uclibc-"*)
296 [[ ${CHOST} == *"-uclibc" ]] && \ 328 [[ ${CHOST} == *"-uclibc" ]] && \
297 ewarn " uClibc patch set '${y}' failed to apply!" 329 ewarn " uClibc patch set '${y}' failed to apply!"
298 ;; 330 ;;
299 "fbsd-"*) 331 "fbsd-"*)
300 [[ ${CHOST} == *"-freebsd"* ]] && \ 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
301 eerror " FreeBSD patch set '${y}' failed to apply!" 335 eerror " FreeBSD patch set '${y}' failed to apply!"
302 die "FreeBSD patch set '${y}' failed to apply!" 336 die "FreeBSD patch set '${y}' failed to apply!"
337 fi
338 fi
339 ;;
340 "darwin-"*)
341 [[ ${CHOST} == *"-darwin"* ]] && \
342 ewarn " Darwin patch set '${y}' failed to apply!"
303 ;; 343 ;;
304 esac 344 esac
305 fi 345 fi
306 done 346 done
307 347
… …
310 ${do_reversedeps} == "no" && \ 350 ${do_reversedeps} == "no" && \
311 ${do_only_patches} == "no" && \ 351 ${do_only_patches} == "no" && \
312 ${deptoremove} == "" ]] 352 ${deptoremove} == "" ]]
313 then 353 then
314 ewarn "Cannot apply any patches, please file a bug about this" 354 ewarn "Cannot apply any patches, please file a bug about this"
315 break
316
317 # Sometimes ltmain.sh is in a subdirectory ...
318 if [[ ! -f ${x}/configure.in && ! -f ${x}/configure.ac ]] ; then
319 if [[ -f ${x}/../configure.in || -f ${x}/../configure.ac ]] ; then
320 cd "${x}"/../
321 fi
322 fi 355 die
323
324 if type -p libtoolize &> /dev/null ; then
325 ewarn "Cannot apply any patches, running libtoolize..."
326 libtoolize --copy --force
327 fi
328 cd "${x}"
329 break
330 fi 356 fi
331 fi 357 fi
332 358
333 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool" 359 [[ -f ${x}/libtool ]] && rm -f "${x}/libtool"
334 360
335 touch "${x}/.elibtoolized" 361 >> "${x}/.elibtoolized"
336 done 362 done
337 363
338 cd "${start_dir}" 364 cd "${start_dir}"
339} 365}
340 366
341uclibctoolize() { 367uclibctoolize() {
342 ewarn "uclibctoolize() is depreciated, please just use libtoolize()!" 368 ewarn "uclibctoolize() is deprecated, please just use elibtoolize()!"
343 elibtoolize 369 elibtoolize
344} 370}
345 371
346darwintoolize() { 372darwintoolize() {
347 local targets="" 373 ewarn "darwintoolize() is deprecated, please just use elibtoolize()!"
348 local x 374 elibtoolize
349
350 if [[ -z $* ]] ; then
351 targets=$(find ${S} -name ltmain.sh -o -name ltconfig)
352 fi
353
354 einfo "Applying Darwin/libtool patches ..."
355 for x in ${targets} ; do
356 [[ ! -s ${x} ]] && continue
357 case ${x##*/} in
358 ltmain.sh|ltconfig)
359 local ver=$(grep '^VERSION=' ${x})
360 ver=${ver/VERSION=}
361 if [[ ${ver:0:3} == "1.4" || ${ver:0:3} == "1.5" ]] ; then
362 ver="1.3" # 1.4, 1.5 and 1.3 are compat
363 fi
364
365 ebegin " Fixing \${S}${x/${S}}"
366 patch -p0 "${x}" "${ELT_PATCH_DIR}/darwin/${x##*/}-${ver:0:3}.patch" > /dev/null
367 eend $? "PLEASE CHECK ${x}"
368 ;;
369 esac
370 done
371} 375}
372 376
373# char *VER_major(string) 377# char *VER_major(string)
374# 378#
375# Return the Major (X of X.Y.Z) version 379# Return the Major (X of X.Y.Z) version
Legend:
Removed from v.1.58  
changed lines
  Added in v.1.83
  ViewVC Help
Powered by ViewVC 1.1.13