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

Diff of /eclass/libtool.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20