| 1 |
george 08/02/11 15:12:31 |
| 2 |
|
| 3 |
Modified: gnatbuild.eclass |
| 4 |
Log: |
| 5 |
few updates from toolchain.eclass, changed how patches are grouped, added few quotations |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.36 eclass/gnatbuild.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.36&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?rev=1.36&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/gnatbuild.eclass?r1=1.35&r2=1.36 |
| 13 |
|
| 14 |
Index: gnatbuild.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v |
| 17 |
retrieving revision 1.35 |
| 18 |
retrieving revision 1.36 |
| 19 |
diff -u -r1.35 -r1.36 |
| 20 |
--- gnatbuild.eclass 27 Dec 2007 08:51:47 -0000 1.35 |
| 21 |
+++ gnatbuild.eclass 11 Feb 2008 15:12:31 -0000 1.36 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2006 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.35 2007/12/27 08:51:47 george Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnatbuild.eclass,v 1.36 2008/02/11 15:12:31 george Exp $ |
| 27 |
# |
| 28 |
# Author: George Shapovalov <george@g.o> |
| 29 |
# Belongs to: ada herd <ada@g.o> |
| 30 |
@@ -8,7 +8,8 @@ |
| 31 |
# Note: HOMEPAGE and LICENSE are set in appropriate ebuild, as |
| 32 |
# gnat is developed by FSF and AdaCore "in parallel" |
| 33 |
|
| 34 |
-inherit eutils versionator toolchain-funcs flag-o-matic multilib libtool fixheadtails gnuconfig pax-utils |
| 35 |
+inherit eutils versionator toolchain-funcs flag-o-matic multilib autotools \ |
| 36 |
+ libtool fixheadtails gnuconfig pax-utils |
| 37 |
|
| 38 |
EXPORT_FUNCTIONS pkg_setup pkg_postinst pkg_postrm src_unpack src_compile src_install |
| 39 |
|
| 40 |
@@ -54,11 +55,8 @@ |
| 41 |
# so tc-* functions are of no use here. The present versioning scheme makes |
| 42 |
# GCCVER basically a part of PV, but *this may change*!! |
| 43 |
# |
| 44 |
-# NOTE: |
| 45 |
-# GCCVER can, in principle, be set in the ebuild. While at present there is no reason to |
| 46 |
-# do so, if this ever becomes the case don't forget to update this assignment |
| 47 |
-# (to check if GCCVER was set first) |
| 48 |
-GCCVER="${GNATRELEASE}" |
| 49 |
+# GCCVER can be set in the ebuild. |
| 50 |
+[[ -z ${GCCVER} ]] && GCCVER="${GNATRELEASE}" |
| 51 |
|
| 52 |
|
| 53 |
# finally extract GCC version strings |
| 54 |
@@ -246,19 +244,23 @@ |
| 55 |
disgusting_gcc_multilib_HACK() { |
| 56 |
local config |
| 57 |
local libdirs |
| 58 |
- case $(tc-arch) in |
| 59 |
- amd64) |
| 60 |
- config="i386/t-linux64" |
| 61 |
- libdirs="../$(get_abi_LIBDIR amd64) ../$(get_abi_LIBDIR x86)" \ |
| 62 |
- ;; |
| 63 |
- ppc64) |
| 64 |
- config="rs6000/t-linux64" |
| 65 |
- libdirs="../$(get_abi_LIBDIR ppc64) ../$(get_abi_LIBDIR ppc)" \ |
| 66 |
- ;; |
| 67 |
- esac |
| 68 |
+ if has_multilib_profile ; then |
| 69 |
+ case $(tc-arch) in |
| 70 |
+ amd64) |
| 71 |
+ config="i386/t-linux64" |
| 72 |
+ libdirs="../$(get_abi_LIBDIR amd64) ../$(get_abi_LIBDIR x86)" \ |
| 73 |
+ ;; |
| 74 |
+ ppc64) |
| 75 |
+ config="rs6000/t-linux64" |
| 76 |
+ libdirs="../$(get_abi_LIBDIR ppc64) ../$(get_abi_LIBDIR ppc)" \ |
| 77 |
+ ;; |
| 78 |
+ esac |
| 79 |
+ else |
| 80 |
+ die "Your profile is no longer supported by portage." |
| 81 |
+ fi |
| 82 |
|
| 83 |
einfo "updating multilib directories to be: ${libdirs}" |
| 84 |
- sed -i -e "s:^MULTILIB_OSDIRNAMES.*:MULTILIB_OSDIRNAMES = ${libdirs}:" ${S}/gcc/config/${config} |
| 85 |
+ sed -i -e "s:^MULTILIB_OSDIRNAMES.*:MULTILIB_OSDIRNAMES = ${libdirs}:" "${S}"/gcc/config/${config} |
| 86 |
} |
| 87 |
|
| 88 |
|
| 89 |
@@ -283,7 +285,7 @@ |
| 90 |
# if primary compiler list is empty, add this profile to the list, so |
| 91 |
# that users are not left without active compilers (making sure that |
| 92 |
# libs are getting built for at least one) |
| 93 |
- elog "" |
| 94 |
+ elog |
| 95 |
. ${GnatCommon} || die "failed to source common code" |
| 96 |
if [[ ! -f ${PRIMELIST} ]] || [[ ! -s ${PRIMELIST} ]]; then |
| 97 |
echo "${gnat_profile}" > ${PRIMELIST} |
| 98 |
@@ -317,8 +319,10 @@ |
| 99 |
|
| 100 |
cd ${S} |
| 101 |
# patching gcc sources, following the toolchain |
| 102 |
- EPATCH_MULTI_MSG="Applying Gentoo patches ..." \ |
| 103 |
- epatch "${FILESDIR}"/patches/*.patch |
| 104 |
+ if [[ -d "${FILESDIR}"/${SLOT} ]] ; then |
| 105 |
+ EPATCH_MULTI_MSG="Applying Gentoo patches ..." \ |
| 106 |
+ epatch "${FILESDIR}"/${SLOT}/*.patch |
| 107 |
+ fi |
| 108 |
# Replacing obsolete head/tail with POSIX compliant ones |
| 109 |
ht_fix_file */configure |
| 110 |
|
| 111 |
@@ -343,7 +347,7 @@ |
| 112 |
|
| 113 |
# regenerate some configures tp fix ACT's omissions |
| 114 |
pushd ${S}/gnattools &> /dev/null |
| 115 |
- autoconf |
| 116 |
+ eautoconf |
| 117 |
popd &> /dev/null |
| 118 |
;; |
| 119 |
|
| 120 |
|
| 121 |
|
| 122 |
|
| 123 |
-- |
| 124 |
gentoo-commits@l.g.o mailing list |
Archives