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

Diff of /eclass/libtool.eclass

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

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