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

Diff of /eclass/libtool.eclass

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

Revision 1.8 Revision 1.20
1#!/bin/bash
2# Copyright 1999-2002 Gentoo Technologies, Inc. 1# Copyright 1999-2003 Gentoo Technologies, Inc.
3# Distributed under the terms of the GNU General Public License, v2 or later 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.20 2003/02/16 04:26:21 vapier Exp $
4#
4# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
5# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.8 2002/06/26 20:17:53 azarah Exp $ 6#
6# This eclass patches ltmain.sh distributed with libtoolized packages with the 7# This eclass patches ltmain.sh distributed with libtoolized packages with the
7# relink and portage patch 8# relink and portage patch
9
8ECLASS=libtool 10ECLASS=libtool
11INHERITED="$INHERITED $ECLASS"
12
9newdepend sys-devel/libtool 13newdepend "!bootstrap? ( sys-devel/libtool )"
10 14
11DESCRIPTION="Based on the ${ECLASS} eclass" 15DESCRIPTION="Based on the ${ECLASS} eclass"
12 16
17ELIBTOOL_VERSION=1.8.1
13 18
14elibtoolize() { 19elibtoolize() {
15 20
16 local x="" 21 local x=""
17 local y="" 22 local y=""
19 local dotest="yes" 24 local dotest="yes"
20 local dorelink="yes" 25 local dorelink="yes"
21 local dotmp="yes" 26 local dotmp="yes"
22 local doportage="yes" 27 local doportage="yes"
23 local portage="no" 28 local portage="no"
29 local reversedeps="no"
30 local removeinternaldep="no"
31 local deptoremove=""
24 local mylist="" 32 local mylist=""
25 33
26 mylist="$(find_ltmain)" 34 mylist="$(find_ltmain)"
27 # Only apply portage patch, and dont "libtoolize --copy --force"
28 # if all patches fail.
29 for x in ${*} 35 for x in ${*}
30 do 36 do
37 # Only apply portage patch, and dont "libtoolize --copy --force"
38 # if all patches fail.
31 if [ "${x}" = "--portage" ] 39 if [ "${x}" = "--portage" ]
32 then 40 then
33 portage="yes" 41 portage="yes"
34 fi 42 fi
43 # Apply the reverse-deps patch
44 #
45 # http://bugzilla.gnome.org/show_bug.cgi?id=75635
46 if [ "${x}" = "--reverse-deps" ]
47 then
48 reversedeps="yes"
49 fi
50 if [ `echo ${x} | grep "^--remove-internal-dep="` ]
51 then
52 removeinternaldep="yes"
53 deptoremove=`echo ${x} | sed -e 's/--remove-internal-dep=//'`
54 fi
35 # Only patch the ltmain.sh in ${S} 55 # Only patch the ltmain.sh in ${S}
36 if [ "${x}" = "--shallow" ] 56 if [ "${x}" = "--shallow" ]
37 then 57 then
38 if [ -f ${S}/ltmain.sh ] 58 if [ -f ${S}/ltmain.sh ]
39 then 59 then
56 dotmp="yes" 76 dotmp="yes"
57 doportage="yes" 77 doportage="yes"
58 78
59 for y in test_patch relink_patch tmp_patch portage_patch 79 for y in test_patch relink_patch tmp_patch portage_patch
60 do 80 do
61 if ! eval ${y} --test $>${T}/libtool.foo 81 if ! eval ${y} --test $>${T}/elibtool.log
62 then 82 then
63 case ${y} in 83 case ${y} in
64 test_patch) 84 test_patch)
65 # non critical patch 85 # non critical patch
66 dotest="no" 86 dotest="no"
91 ;; 111 ;;
92 esac 112 esac
93 fi 113 fi
94 done 114 done
95 115
116# Only apply portage patch ... I think if other can apply, they should.
117# if [ "${portage}" = "yes" ]
118# then
119# dotest="no"
120# dorelink="no"
121# dotmp="no"
122# fi
123
96 for y in test_patch relink_patch tmp_patch portage_patch 124 for y in test_patch relink_patch tmp_patch portage_patch
97 do 125 do
98 if [ "${dopatch}" = "yes" ] 126 if [ "${dopatch}" = "yes" ]
99 then 127 then
100 case ${y} in 128 case ${y} in
123 fi 151 fi
124 ;; 152 ;;
125 esac 153 esac
126 154
127 einfo "Applying libtool-${y/_patch/}.patch..." 155 einfo "Applying libtool-${y/_patch/}.patch..."
128 eval ${y} $>${T}/libtool.foo 156 eval ${y} $>${T}/elibtool.log
129 elif [ "${portage}" = "no" ] 157 elif [ "${portage}" = "no" ] && [ "${reversedeps}" = "no" ] && [ "${removeinternaldep}" = "no" ]
130 then 158 then
159 # Sometimes ltmain.sh is in a subdirectory ...
160 if [ ! -f ${x}/configure.in -a ! -f ${x}/configure.ac ]
161 then
162 if [ -f ${x}/../configure.in -o -f ${x}/../configure.ac ]
163 then
164 cd ${x}/../
165 fi
166 fi
167
168 ewarn "Cannot apply any patch, running libtoolize..."
131 libtoolize --copy --force 169 libtoolize --copy --force
170 cd ${x}
132 break 171 break
133 fi 172 fi
134 done 173 done
174
175 if [ "${reversedeps}" = "yes" ]
176 then
177 if eval reversedeps_patch --test $>${T}/libtool.foo
178 then
179 einfo "Applying libtool-reverse-deps.patch..."
180 eval reversedeps_patch $>${T}/libtool.foo
181 else
182 ewarn "Not applying libtool-reverse-deps.patch..."
183 fi
184 fi
185
186 if [ "${removeinternaldep}" = "yes" ]
187 then
188 if eval remove_internal_dep_patch $deptoremove --test $>${T}/libtool.foo
189 then
190 einfo "Applying remove-internal-dep.patch (removing $deptoremove)..."
191 eval remove_internal_dep_patch $deptoremove $>${T}/libtool.foo
192 else
193 ewarn "Not applying libtool-remove-internal-dep.patch..."
194 fi
195 fi
135 done 196 done
136 197
137 if [ -f libtool ] 198 if [ -f libtool ]
138 then 199 then
139 rm -f libtool 200 rm -f libtool
177 fi 238 fi
178 239
179 patch ${opts} -p0 <<-"ENDPATCH" 240 patch ${opts} -p0 <<-"ENDPATCH"
180 --- ltmain.sh.orig Wed Apr 3 01:19:37 2002 241 --- ltmain.sh.orig Wed Apr 3 01:19:37 2002
181 +++ ltmain.sh Sun May 26 19:50:52 2002 242 +++ ltmain.sh Sun May 26 19:50:52 2002
182 @@ -3940,9 +3940,40 @@ 243 @@ -3940,9 +3940,46 @@
183 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 244 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
184 exit 1 245 exit 1
185 fi 246 fi
186 - newdependency_libs="$newdependency_libs $libdir/$name" 247 - newdependency_libs="$newdependency_libs $libdir/$name"
187 + # We do not want portage's install root ($D) present. Check only for 248 + # We do not want portage's install root ($D) present. Check only for
188 + # this if the .la is being installed. 249 + # this if the .la is being installed.
189 + if test "$installed" = yes && test "$D"; then 250 + if test "$installed" = yes && test "$D"; then
190 + mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'`" 251 + eval mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'`"
191 + else 252 + else
192 + mynewdependency_lib="$libdir/$name" 253 + mynewdependency_lib="$libdir/$name"
193 + fi 254 + fi
194 + # Do not add duplicates 255 + # Do not add duplicates
195 + if test "$mynewdependency_lib"; then 256 + if test "$mynewdependency_lib"; then
196 + if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then 257 + if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
197 + newdependency_libs="$newdependency_libs $mynewdependency_lib" 258 + newdependency_libs="$newdependency_libs $mynewdependency_lib"
198 + fi 259 + fi
199 + fi 260 + fi
200 + ;; 261 + ;;
201 + *) 262 + *)
202 + if test "$installed" = yes && test "$S"; then 263 + if test "$installed" = yes; then
264 + # Rather use S=WORKDIR if our version of portage supports it.
265 + # This is because some ebuild (gcc) do not use $S as buildroot.
266 + if test "$PWORKDIR"; then
267 + S="$PWORKDIR"
268 + fi
203 + # We do not want portage's build root ($S) present. 269 + # We do not want portage's build root ($S) present.
204 + if test -n "`echo $deplib |grep -e "$S"`" 270 + if test -n "`echo $deplib |grep -e "$S"`" && test "$S"; then
205 + then
206 + newdependency_libs="" 271 + mynewdependency_lib=""
207 + # We do not want portage's install root ($D) present. 272 + # We do not want portage's install root ($D) present.
208 + elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then 273 + elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then
209 + mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`" 274 + eval mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`"
275 + else
276 + mynewdependency_lib="$deplib"
210 + fi 277 + fi
211 + else 278 + else
212 + mynewdependency_lib="$deplib" 279 + mynewdependency_lib="$deplib"
213 + fi 280 + fi
214 + # Do not add duplicates 281 + # Do not add duplicates
215 + if test "$mynewdependency_lib"; then 282 + if test "$mynewdependency_lib"; then
216 + if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then 283 + if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
217 + newdependency_libs="$newdependency_libs $mynewdependency_lib" 284 + newdependency_libs="$newdependency_libs $mynewdependency_lib"
218 + fi 285 + fi
219 + fi 286 + fi
220 ;; 287 ;;
221 - *) newdependency_libs="$newdependency_libs $deplib" ;; 288 - *) newdependency_libs="$newdependency_libs $deplib" ;;
222 esac 289 esac
349 fi 416 fi
350 fi 417 fi
351 418
352 ENDPATCH 419 ENDPATCH
353 420
354 retval=$? 421 retval=$?
355 422
356 # This one dont apply clean to libtool-1.4.2a, so do it manually. 423 # This one dont apply clean to libtool-1.4.2a, so do it manually.
357 if [ "${1}" != "--test" ] && [ "${retval}" -eq 0 ] 424 if [ "${1}" != "--test" ] && [ "${retval}" -eq 0 ]
358 then 425 then
359 cp ltmain.sh ltmain.sh.orig 426 cp ltmain.sh ltmain.sh.orig
360 sed -e 's:cd `pwd`; $SHELL $0 --mode=relink $libtool_args:cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@:' \ 427 sed -e 's:cd `pwd`; $SHELL $0 --mode=relink $libtool_args:cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@:' \
361 ltmain.sh.orig > ltmain.sh 428 ltmain.sh.orig > ltmain.sh
362 rm -f ltmain.sh.orig 429 rm -f ltmain.sh.orig
363 fi 430 fi
364 431
365 return ${retval} 432 return ${retval}
366} 433}
367 434
368tmp_patch() { 435tmp_patch() {
369 436
370 local opts="" 437 local opts=""
695 hardcode_libdirs= 762 hardcode_libdirs=
696 dep_rpath= 763 dep_rpath=
697 ENDPATCH 764 ENDPATCH
698} 765}
699 766
767reversedeps_patch() {
768
769 local opts=""
770
771 if [ "${1}" = "--test" ]
772 then
773 opts="--force --dry-run"
774 fi
775
776 patch ${opts} -p0 <<-"ENDPATCH"
777 --- ltmain.sh.orig Sat Mar 23 22:48:45 2002
778 +++ ltmain.sh Sat Mar 23 22:45:38 2002
779 @@ -1553,6 +1553,8 @@
780 convenience="$convenience $ladir/$objdir/$old_library"
781 old_convenience="$old_convenience $ladir/$objdir/$old_library"
782 tmp_libs=
783 + # PKGW
784 + dependency_libs=
785 for deplib in $dependency_libs; do
786 deplibs="$deplib $deplibs"
787 case "$tmp_libs " in
788 @@ -1668,6 +1670,8 @@
789 fi
790
791 tmp_libs=
792 + #PKGW
793 + dependency_libs=
794 for deplib in $dependency_libs; do
795 case $deplib in
796 -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
797 @@ -2081,7 +2085,7 @@
798 -L*)
799 case " $tmp_libs " in
800 *" $deplib "*) ;;
801 - *) tmp_libs="$tmp_libs $deplib" ;;
802 + *) tmp_libs="$deplib $tmp_libs" ;;
803 esac
804 ;;
805 *) tmp_libs="$tmp_libs $deplib" ;;
806 ENDPATCH
807}
808
809remove_internal_dep_patch() {
810 local opts=""
811
812 if [ "${2}" = "--test" ]
813 then
814 opts="--force --dry-run"
815 fi
816
817 patch ${opts} -p0 <<-ENDPATCH
818 --- ltmain.sh.orig 2002-11-01 19:56:50.000000000 -0600
819 +++ ltmain.sh 2002-11-01 19:57:03.000000000 -0600
820 @@ -4551,6 +4551,8 @@
821 if test "\$installed" = yes && test "\$D"; then
822 install_libdir="\`echo "\$install_libdir" |sed -e "s:\$D::g" -e 's://:/:g'\`"
823 fi
824 + # Removing $1 from dependency_libs in .la
825 + dependency_libs=\`echo \$dependency_libs | \$Xsed -e 's%\([^ ]*lib${1}\.\(so\|la\|a\)\)\|\(-l${1}\)%%g'\`
826 \$echo > \$output "\\
827 # \$outputname - a libtool library file
828 # Generated by \$PROGRAM - GNU \$PACKAGE \$VERSION\$TIMESTAMP
829 ENDPATCH
830}
831

Legend:
Removed from v.1.8  
changed lines
  Added in v.1.20

  ViewVC Help
Powered by ViewVC 1.1.20