/[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.9
1#!/bin/bash 1#!/bin/bash
2# Copyright 1999-2002 Gentoo Technologies, Inc. 2# Copyright 1999-2002 Gentoo Technologies, Inc.
3# Distributed under the terms of the GNU General Public License, v2 or later 3# Distributed under the terms of the GNU General Public License, v2 or later
4# Author: Martin Schlemmer <azarah@gentoo.org> 4# 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 $ 5# $Header: /var/cvsroot/gentoo-x86/eclass/libtool.eclass,v 1.9 2002/06/26 22:38:07 azarah Exp $
6# This eclass patches ltmain.sh distributed with libtoolized packages with the 6# This eclass patches ltmain.sh distributed with libtoolized packages with the
7# relink and portage patch 7# relink and portage patch
8ECLASS=libtool 8ECLASS=libtool
9newdepend sys-devel/libtool 9newdepend sys-devel/libtool
10 10
11DESCRIPTION="Based on the ${ECLASS} eclass" 11DESCRIPTION="Based on the ${ECLASS} eclass"
12 12
13ELIBTOOL_VERSION=1.8.1
13 14
14elibtoolize() { 15elibtoolize() {
15 16
16 local x="" 17 local x=""
17 local y="" 18 local y=""
177 fi 178 fi
178 179
179 patch ${opts} -p0 <<-"ENDPATCH" 180 patch ${opts} -p0 <<-"ENDPATCH"
180 --- ltmain.sh.orig Wed Apr 3 01:19:37 2002 181 --- ltmain.sh.orig Wed Apr 3 01:19:37 2002
181 +++ ltmain.sh Sun May 26 19:50:52 2002 182 +++ ltmain.sh Sun May 26 19:50:52 2002
182 @@ -3940,9 +3940,40 @@ 183 @@ -3940,9 +3940,41 @@
183 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 184 $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
184 exit 1 185 exit 1
185 fi 186 fi
186 - newdependency_libs="$newdependency_libs $libdir/$name" 187 - newdependency_libs="$newdependency_libs $libdir/$name"
187 + # We do not want portage's install root ($D) present. Check only for 188 + # We do not want portage's install root ($D) present. Check only for
197 + newdependency_libs="$newdependency_libs $mynewdependency_lib" 198 + newdependency_libs="$newdependency_libs $mynewdependency_lib"
198 + fi 199 + fi
199 + fi 200 + fi
200 + ;; 201 + ;;
201 + *) 202 + *)
202 + if test "$installed" = yes && test "$S"; then 203 + if test "$installed" = yes; then
203 + # We do not want portage's build root ($S) present. 204 + # We do not want portage's build root ($S) present.
204 + if test -n "`echo $deplib |grep -e "$S"`" 205 + if test -n "`echo $deplib |grep -e "$S"`" && test "$S"; then
205 + then
206 + newdependency_libs="" 206 + newdependency_libs=""
207 + # We do not want portage's install root ($D) present. 207 + # We do not want portage's install root ($D) present.
208 + elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then 208 + elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then
209 + mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`" 209 + mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`"
210 + else
211 + mynewdependency_lib="$deplib"
210 + fi 212 + fi
211 + else 213 + else
212 + mynewdependency_lib="$deplib" 214 + mynewdependency_lib="$deplib"
213 + fi 215 + fi
214 + # Do not add duplicates 216 + # Do not add duplicates

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

  ViewVC Help
Powered by ViewVC 1.1.20