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

Diff of /eclass/libtool.eclass

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

Revision 1.56 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.56 2005/09/04 20:23:42 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
… …
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=
88 local rem_int_dep=$3
70 local version= 89 local version=
71 local ltmain_sh=$1 90 local ltmain_sh=$1
72 91
73 [[ $1 == *"/configure" ]] && ltmain_sh=${ELT_LTMAIN_SH} 92 [[ ${file} == *"/configure" ]] && ltmain_sh=${ELT_LTMAIN_SH}
74 version=$(eval $(grep -e '^[[:space:]]*VERSION=' "${ltmain_sh}"); \ 93 version=$(ELT_libtool_version "${ltmain_sh}")
75 echo "${VERSION}")
76 94
77 if [[ -n $2 ]] ; then 95 if [[ -n ${patch_set} ]] ; then
78 if [[ -d ${ELT_PATCH_DIR}/$2 ]] ; then 96 if [[ -d ${ELT_PATCH_DIR}/${patch_set} ]] ; then
79 patch_dir="${ELT_PATCH_DIR}/$2" 97 patch_dir="${ELT_PATCH_DIR}/${patch_set}"
80 else 98 else
81 return ${ret} 99 return "${ret}"
82 fi 100 fi
83 101
84 if [[ -z ${version} ]] ; then 102 if [[ ${version} == "0" ]] ; then
85 eerror "Could not get VERSION for ${1##*/}!" 103 eerror "Could not get VERSION for ${file##*/}!"
86 die "Could not get VERSION for ${1##*/}!" 104 die "Could not get VERSION for ${file##*/}!"
87 fi 105 fi
88 106
89 # Go through the patches in reverse order (large to small) 107 # Go through the patches in reverse order (large to small)
90 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
91 if [[ -n ${x} && -f ${x} ]] ; then 109 if [[ -n ${x} && -f ${x} ]] ; then
92 local ltver=$(VER_to_int "${version}") 110 local ltver=$(VER_to_int "${version}")
93 local ptver=$(VER_to_int "${x##*/}") 111 local ptver=$(VER_to_int "${x##*/}")
94 112
95 # If libtool version smaller than patch version, skip patch. 113 # If libtool version smaller than patch version, skip patch.
96 [[ ${ltver} -lt ${ptver} ]] && continue 114 [[ ${ltver} -lt ${ptver} ]] && continue
97 # For --remove-internal-dep ... 115 # For --remove-internal-dep ...
98 if [[ -n $3 ]] ; then 116 if [[ -n ${rem_int_dep} ]] ; then
99 # For replace @REM_INT_DEP@ with what was passed 117 # For replace @REM_INT_DEP@ with what was passed
100 # to --remove-internal-dep 118 # to --remove-internal-dep
101 sed -e "s|@REM_INT_DEP@|$3|g" ${x} > \ 119 sed -e "s|@REM_INT_DEP@|${rem_int_dep}|g" ${x} > \
102 ${T}/$$.rem_int_deps.patch 120 "${T}/$$.rem_int_deps.patch"
103 121
104 x="${T}/$$.rem_int_deps.patch" 122 x="${T}/$$.rem_int_deps.patch"
105 fi 123 fi
106 124
107 if ELT_try_and_apply_patch "$1" "${x}" ; then 125 if ELT_try_and_apply_patch "${file}" "${x}" ; then
108 ret=0 126 ret=0
109 break 127 break
110 fi 128 fi
111 fi 129 fi
112 done 130 done
113 fi 131 fi
114 132
115 return ${ret} 133 return "${ret}"
116} 134}
117 135
118elibtoolize() { 136elibtoolize() {
119 local x= 137 local x=
120 local y= 138 local y=
… …
123 local do_only_patches="no" 141 local do_only_patches="no"
124 local do_uclibc="yes" 142 local do_uclibc="yes"
125 local deptoremove= 143 local deptoremove=
126 local my_dirlist= 144 local my_dirlist=
127 local elt_patches="portage relink max_cmd_len sed test tmp" 145 local elt_patches="portage relink max_cmd_len sed test tmp"
128 local start_dir="${PWD}" 146 local start_dir=${PWD}
129 147
130 my_dirlist="$(ELT_find_ltmain_sh)" 148 my_dirlist=$(ELT_find_ltmain_sh)
131 149
132 for x in "$@" ; do 150 for x in "$@" ; do
133 case "${x}" in 151 case "${x}" in
134 "--portage") 152 "--portage")
135 # Only apply portage patch, and don't 153 # Only apply portage patch, and don't
… …
147 do_only_patches="yes" 165 do_only_patches="yes"
148 ;; 166 ;;
149 "^--remove-internal-dep="*) 167 "^--remove-internal-dep="*)
150 # We will replace @REM_INT_DEP@ with what is needed 168 # We will replace @REM_INT_DEP@ with what is needed
151 # in ELT_walk_patches() ... 169 # in ELT_walk_patches() ...
152 deptoremove="$(echo "${x}" | sed -e 's|--remove-internal-dep=||')" 170 deptoremove=$(echo "${x}" | sed -e 's|--remove-internal-dep=||')
153 171
154 # Add the patch for this ... 172 # Add the patch for this ...
155 [ -n "${deptoremove}" ] && elt_patches="${elt_patches} rem-int-dep" 173 [[ -n ${deptoremove} ]] && elt_patches="${elt_patches} rem-int-dep"
156 ;; 174 ;;
157 "--shallow") 175 "--shallow")
158 # Only patch the ltmain.sh in ${S} 176 # Only patch the ltmain.sh in ${S}
159 if [ -f "${S}/ltmain.sh" ] 177 if [[ -f ${S}/ltmain.sh ]] ; then
160 then
161 my_dirlist="${S}" 178 my_dirlist=${S}
162 else 179 else
163 my_dirlist= 180 my_dirlist=
164 fi 181 fi
165 ;; 182 ;;
166 "--no-uclibc") 183 "--no-uclibc")
167 do_uclibc="no" 184 do_uclibc="no"
168 ;; 185 ;;
169 *) 186 *)
170 eerror "Invalid elibtoolize option: $x" 187 eerror "Invalid elibtoolize option: ${x}"
171 die "elibtoolize called with $x ??" 188 die "elibtoolize called with ${x} ??"
172 esac 189 esac
173 done 190 done
174 191
175 [[ ${do_uclibc} == "yes" ]] && \ 192 [[ ${do_uclibc} == "yes" ]] && \
176 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf" 193 elt_patches="${elt_patches} uclibc-conf uclibc-ltconf"
177 194
178 [[ ${CHOST} == *"-freebsd"* ]] && \ 195 [[ ${CHOST} == *"-freebsd"* ]] && \
179 elt_patches="${elt_patches} fbsd-conf" 196 elt_patches="${elt_patches} fbsd-conf"
180 197
181 if use ppc-macos ; then 198 if useq ppc-macos ; then
182 local opts 199 local opts
183 [[ -f Makefile.am ]] && opts="--automake" 200 [[ -f Makefile.am ]] && opts="--automake"
184 glibtoolize --copy --force ${opts} 201 glibtoolize --copy --force ${opts}
185 darwintoolize 202
203 elt_patches="${elt_patches} darwin-ltconf darwin-ltmain"
186 fi 204 fi
187 205
188 for x in ${my_dirlist} ; do 206 for x in ${my_dirlist} ; do
189 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||") 207 local tmp=$(echo "${x}" | sed -e "s|${WORKDIR}||")
190 export ELT_APPLIED_PATCHES= 208 export ELT_APPLIED_PATCHES=
… …
216 ELT_walk_patches "${x}/ltmain.sh" "${y}" 234 ELT_walk_patches "${x}/ltmain.sh" "${y}"
217 ret=$? 235 ret=$?
218 fi 236 fi
219 ;; 237 ;;
220 "uclibc-conf") 238 "uclibc-conf")
221 if [[ -e ${x}/configure ]] && \ 239 if [[ -e ${x}/configure && \
222 grep 'Transform linux' "${x}/configure" > /dev/null ; then 240 -n $(grep 'Transform linux' "${x}/configure") ]] ; then
223 ELT_walk_patches "${x}/configure" "${y}" 241 ELT_walk_patches "${x}/configure" "${y}"
224 ret=$? 242 ret=$?
225 # ltmain.sh and co might be in a subdirectory ... 243 # ltmain.sh and co might be in a subdirectory ...
226 elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] && \ 244 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
227 grep 'Transform linux' "${x}/../configure" > /dev/null ; then 245 -n $(grep 'Transform linux' "${x}/../configure") ]] ; then
228 ELT_walk_patches "${x}/../configure" "${y}" 246 ELT_walk_patches "${x}/../configure" "${y}"
229 ret=$? 247 ret=$?
230 fi 248 fi
231 ;; 249 ;;
232 "uclibc-ltconf") 250 "uclibc-ltconf")
251 # Newer libtoolize clears ltconfig, as not used anymore
233 if [[ -e ${x}/ltconfig ]] ; then 252 if [[ -s ${x}/ltconfig ]] ; then
234 ELT_walk_patches "${x}/ltconfig" "${y}" 253 ELT_walk_patches "${x}/ltconfig" "${y}"
235 ret=$? 254 ret=$?
236 fi 255 fi
237 ;; 256 ;;
238 "fbsd-conf") 257 "fbsd-conf")
239 if [[ -e ${x}/configure ]] && \ 258 if [[ -e ${x}/configure && \
240 grep 'version_type=freebsd-' "${x}/configure" > /dev/null ; then 259 -n $(grep 'version_type=freebsd-' "${x}/configure") ]] ; then
241 ELT_walk_patches "${x}/configure" "${y}" 260 ELT_walk_patches "${x}/configure" "${y}"
242 ret=$? 261 ret=$?
243 # ltmain.sh and co might be in a subdirectory ... 262 # ltmain.sh and co might be in a subdirectory ...
244 elif [[ ! -e ${x}/configure && -e ${x}/../configure ]] && \ 263 elif [[ ! -e ${x}/configure && -e ${x}/../configure && \
245 grep 'version_type=freebsd-' "${x}/../configure" > /dev/null ; then 264 -n $(grep 'version_type=freebsd-' "${x}/../configure") ]] ; then
246 ELT_walk_patches "${x}/../configure" "${y}" 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}"
247 ret=$? 273 ret=$?
248 fi 274 fi
249 ;; 275 ;;
250 *) 276 *)
251 ELT_walk_patches "${x}/ltmain.sh" "${y}" 277 ELT_walk_patches "${x}/ltmain.sh" "${y}"
… …
254 esac 280 esac
255 281
256 if [[ ${ret} -ne 0 ]] ; then 282 if [[ ${ret} -ne 0 ]] ; then
257 case ${y} in 283 case ${y} in
258 "relink") 284 "relink")
285 local version=$(ELT_libtool_version "${x}/ltmain.sh")
259 # 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
260 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
261 ewarn " Could not apply relink.patch!" 290 ewarn " Could not apply relink.patch!"
262 fi 291 fi
263 ;; 292 ;;
264 "portage") 293 "portage")
265 # Critical patch - for this one we abort, as it can really 294 # Critical patch - for this one we abort, as it can really
… …
292 "uclibc-"*) 321 "uclibc-"*)
293 [[ ${CHOST} == *"-uclibc" ]] && \ 322 [[ ${CHOST} == *"-uclibc" ]] && \
294 ewarn " uClibc patch set '${y}' failed to apply!" 323 ewarn " uClibc patch set '${y}' failed to apply!"
295 ;; 324 ;;
296 "fbsd-"*) 325 "fbsd-"*)
297 [[ ${CHOST} == *"-freebsd"* ]] && \ 326 if [[ ${CHOST} == *"-freebsd"* ]] ; then
327 if [[ -z $(grep 'Handle Gentoo/FreeBSD as it was Linux' "${x}/configure") ]]; then
298 eerror " FreeBSD patch set '${y}' failed to apply!" 328 eerror " FreeBSD patch set '${y}' failed to apply!"
299 die "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!"
300 ;; 336 ;;
301 esac 337 esac
302 fi 338 fi
303 done 339 done
304 340
… …
334 370
335 cd "${start_dir}" 371 cd "${start_dir}"
336} 372}
337 373
338uclibctoolize() { 374uclibctoolize() {
339 ewarn "uclibctoolize() is depreciated, please just use libtoolize()!" 375 ewarn "uclibctoolize() is depreciated, please just use elibtoolize()!"
340 elibtoolize 376 elibtoolize
341} 377}
342 378
343darwintoolize() { 379darwintoolize() {
344 local targets="" 380 ewarn "darwintoolize() is depreciated, please just use elibtoolize()!"
345 local x 381 elibtoolize
346
347 if [[ -z $* ]] ; then
348 targets=$(find ${S} -name ltmain.sh -o -name ltconfig)
349 fi
350
351 einfo "Applying Darwin/libtool patches ..."
352 for x in ${targets} ; do
353 [[ ! -s ${x} ]] && continue
354 case ${x##*/} in
355 ltmain.sh|ltconfig)
356 local ver=$(grep '^VERSION=' ${x})
357 ver=${ver/VERSION=}
358 if [[ ${ver:0:3} == "1.4" || ${ver:0:3} == "1.5" ]] ; then
359 ver="1.3" # 1.4, 1.5 and 1.3 are compat
360 fi
361
362 ebegin " Fixing \${S}${x/${S}}"
363 patch -p0 "${x}" "${ELT_PATCH_DIR}/darwin/${x##*/}-${ver:0:3}.patch" > /dev/null
364 eend $? "PLEASE CHECK ${x}"
365 ;;
366 esac
367 done
368} 382}
369 383
370# char *VER_major(string) 384# char *VER_major(string)
371# 385#
372# Return the Major (X of X.Y.Z) version 386# Return the Major (X of X.Y.Z) version
373# 387#
374VER_major() { 388VER_major() {
375 [[ -z $1 ]] && return 1 389 [[ -z $1 ]] && return 1
376 390
377 local VER=$@ 391 local VER=$@
378 echo ${VER%%[^[:digit:]]*} 392 echo "${VER%%[^[:digit:]]*}"
379} 393}
380 394
381# char *VER_minor(string) 395# char *VER_minor(string)
382# 396#
383# Return the Minor (Y of X.Y.Z) version 397# Return the Minor (Y of X.Y.Z) version
… …
385VER_minor() { 399VER_minor() {
386 [[ -z $1 ]] && return 1 400 [[ -z $1 ]] && return 1
387 401
388 local VER=$@ 402 local VER=$@
389 VER=${VER#*.} 403 VER=${VER#*.}
390 echo ${VER%%[^[:digit:]]*} 404 echo "${VER%%[^[:digit:]]*}"
391} 405}
392 406
393# char *VER_micro(string) 407# char *VER_micro(string)
394# 408#
395# Return the Micro (Z of X.Y.Z) version. 409# Return the Micro (Z of X.Y.Z) version.
… …
397VER_micro() { 411VER_micro() {
398 [[ -z $1 ]] && return 1 412 [[ -z $1 ]] && return 1
399 413
400 local VER=$@ 414 local VER=$@
401 VER=${VER#*.*.} 415 VER=${VER#*.*.}
402 echo ${VER%%[^[:digit:]]*} 416 echo "${VER%%[^[:digit:]]*}"
403} 417}
404 418
405# int VER_to_int(string) 419# int VER_to_int(string)
406# 420#
407# 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.56  
changed lines
  Added in v.1.62
  ViewVC Help
Powered by ViewVC 1.1.13