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

Diff of /eclass/libtool.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20