| 1 |
grobian 09/09/02 09:00:08 |
| 2 |
|
| 3 |
Modified: toolchain-funcs.eclass |
| 4 |
Log: |
| 5 |
Make the lib we're going to update using install_name_tool writable if |
| 6 |
it isn't. Restore write permissions afterwards, fixes bug #283424 |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.94 eclass/toolchain-funcs.eclass |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-funcs.eclass?rev=1.94&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-funcs.eclass?rev=1.94&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain-funcs.eclass?r1=1.93&r2=1.94 |
| 14 |
|
| 15 |
Index: toolchain-funcs.eclass |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v |
| 18 |
retrieving revision 1.93 |
| 19 |
retrieving revision 1.94 |
| 20 |
diff -u -r1.93 -r1.94 |
| 21 |
--- toolchain-funcs.eclass 15 Aug 2009 15:12:56 -0000 1.93 |
| 22 |
+++ toolchain-funcs.eclass 2 Sep 2009 09:00:08 -0000 1.94 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2007 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.93 2009/08/15 15:12:56 grobian Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-funcs.eclass,v 1.94 2009/09/02 09:00:08 grobian Exp $ |
| 28 |
|
| 29 |
# @ECLASS: toolchain-funcs.eclass |
| 30 |
# @MAINTAINER: |
| 31 |
@@ -471,9 +471,14 @@ |
| 32 |
# libdir=/lib because that messes up libtool files. |
| 33 |
# Make sure we don't lose the specific version, so just modify the |
| 34 |
# existing install_name |
| 35 |
+ if [[ ! -w "${ED}/${libdir}/${tlib}" ]] ; then |
| 36 |
+ fperms u+w "${libdir}/${tlib}" # needed to write to it |
| 37 |
+ local nowrite=yes |
| 38 |
+ fi |
| 39 |
install_name_tool \ |
| 40 |
-id "${EPREFIX}"/${libdir}/${tlib} \ |
| 41 |
- "${ED}"/${libdir}/${tlib} |
| 42 |
+ "${ED}"/${libdir}/${tlib} || die "install_name_tool failed" |
| 43 |
+ [[ -n ${nowrite} ]] && fperms u-w "${libdir}/${tlib}" |
| 44 |
# Now as we don't use GNU binutils and our linker doesn't |
| 45 |
# understand linker scripts, just create a symlink. |
| 46 |
pushd "${ED}/usr/${libdir}" > /dev/null |
Archives