| 1 |
vapier 12/06/01 17:49:18 |
| 2 |
|
| 3 |
Modified: common.eblit src_install.eblit |
| 4 |
Log: |
| 5 |
Unify alt_libdir definition and use alt_prefix where possible. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.26 sys-libs/glibc/files/eblits/common.eblit |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.26&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?rev=1.26&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit?r1=1.25&r2=1.26 |
| 15 |
|
| 16 |
Index: common.eblit |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v |
| 19 |
retrieving revision 1.25 |
| 20 |
retrieving revision 1.26 |
| 21 |
diff -u -r1.25 -r1.26 |
| 22 |
--- common.eblit 22 Dec 2011 01:09:58 -0000 1.25 |
| 23 |
+++ common.eblit 1 Jun 2012 17:49:18 -0000 1.26 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
-# Copyright 1999-2011 Gentoo Foundation |
| 26 |
+# Copyright 1999-2012 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.25 2011/12/22 01:09:58 vapier Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/common.eblit,v 1.26 2012/06/01 17:49:18 vapier Exp $ |
| 30 |
|
| 31 |
alt_prefix() { |
| 32 |
is_crosscompile && echo /usr/${CTARGET} |
| 33 |
@@ -28,6 +28,9 @@ |
| 34 |
echo "${ALT_BUILD_HEADERS}" |
| 35 |
} |
| 36 |
|
| 37 |
+alt_libdir() { |
| 38 |
+ echo $(alt_prefix)/$(get_libdir) |
| 39 |
+} |
| 40 |
alt_usrlibdir() { |
| 41 |
echo $(alt_prefix)/usr/$(get_libdir) |
| 42 |
} |
| 43 |
|
| 44 |
|
| 45 |
|
| 46 |
1.21 sys-libs/glibc/files/eblits/src_install.eblit |
| 47 |
|
| 48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?rev=1.21&view=markup |
| 49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?rev=1.21&content-type=text/plain |
| 50 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit?r1=1.20&r2=1.21 |
| 51 |
|
| 52 |
Index: src_install.eblit |
| 53 |
=================================================================== |
| 54 |
RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v |
| 55 |
retrieving revision 1.20 |
| 56 |
retrieving revision 1.21 |
| 57 |
diff -u -r1.20 -r1.21 |
| 58 |
--- src_install.eblit 22 Dec 2011 01:09:58 -0000 1.20 |
| 59 |
+++ src_install.eblit 1 Jun 2012 17:49:18 -0000 1.21 |
| 60 |
@@ -1,6 +1,6 @@ |
| 61 |
-# Copyright 1999-2011 Gentoo Foundation |
| 62 |
+# Copyright 1999-2012 Gentoo Foundation |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.20 2011/12/22 01:09:58 vapier Exp $ |
| 65 |
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/src_install.eblit,v 1.21 2012/06/01 17:49:18 vapier Exp $ |
| 66 |
|
| 67 |
toolchain-glibc_src_install() { |
| 68 |
local GBUILDDIR |
| 69 |
@@ -165,7 +165,7 @@ |
| 70 |
toolchain-glibc_headers_install() { |
| 71 |
local GBUILDDIR=${WORKDIR}/build-${ABI}-${CTARGET}-headers |
| 72 |
cd "${GBUILDDIR}" |
| 73 |
- emake install_root="${D}/usr/${CTARGET}" install-headers || die "install-headers failed" |
| 74 |
+ emake install_root="${D}$(alt_prefix)" install-headers || die |
| 75 |
# Copy over headers that are not part of install-headers ... these |
| 76 |
# are pretty much taken verbatim from crosstool, see it for more details |
| 77 |
insinto $(alt_headers)/bits |
Archives