| 1 |
jlec 11/05/28 12:19:18 |
| 2 |
|
| 3 |
Modified: ChangeLog cns-1.2.1-r6.ebuild cns-1.2.1-r5.ebuild |
| 4 |
cns-1.3_p5.ebuild |
| 5 |
Log: |
| 6 |
Steal bitness check from dev-libs/nss |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.38 sci-chemistry/cns/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/ChangeLog?rev=1.38&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/ChangeLog?rev=1.38&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/ChangeLog?r1=1.37&r2=1.38 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v |
| 20 |
retrieving revision 1.37 |
| 21 |
retrieving revision 1.38 |
| 22 |
diff -u -r1.37 -r1.38 |
| 23 |
--- ChangeLog 28 May 2011 12:09:36 -0000 1.37 |
| 24 |
+++ ChangeLog 28 May 2011 12:19:18 -0000 1.38 |
| 25 |
@@ -1,6 +1,10 @@ |
| 26 |
# ChangeLog for sci-chemistry/cns |
| 27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.37 2011/05/28 12:09:36 jlec Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/ChangeLog,v 1.38 2011/05/28 12:19:18 jlec Exp $ |
| 30 |
+ |
| 31 |
+ 28 May 2011; Justin Lecher <jlec@g.o> cns-1.2.1-r5.ebuild, |
| 32 |
+ cns-1.2.1-r6.ebuild, cns-1.3_p5.ebuild: |
| 33 |
+ Steal bitness check from dev-libs/nss |
| 34 |
|
| 35 |
28 May 2011; Justin Lecher <jlec@g.o> cns-1.2.1-r6.ebuild: |
| 36 |
Removed bad alias definition |
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.4 sci-chemistry/cns/cns-1.2.1-r6.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r6.ebuild?rev=1.4&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r6.ebuild?rev=1.4&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r6.ebuild?r1=1.3&r2=1.4 |
| 45 |
|
| 46 |
Index: cns-1.2.1-r6.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r6.ebuild,v |
| 49 |
retrieving revision 1.3 |
| 50 |
retrieving revision 1.4 |
| 51 |
diff -u -r1.3 -r1.4 |
| 52 |
--- cns-1.2.1-r6.ebuild 28 May 2011 12:09:36 -0000 1.3 |
| 53 |
+++ cns-1.2.1-r6.ebuild 28 May 2011 12:19:18 -0000 1.4 |
| 54 |
@@ -1,8 +1,8 @@ |
| 55 |
# Copyright 1999-2011 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r6.ebuild,v 1.3 2011/05/28 12:09:36 jlec Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r6.ebuild,v 1.4 2011/05/28 12:19:18 jlec Exp $ |
| 59 |
|
| 60 |
-EAPI="3" |
| 61 |
+EAPI=3 |
| 62 |
|
| 63 |
inherit eutils toolchain-funcs versionator flag-o-matic |
| 64 |
|
| 65 |
@@ -52,9 +52,22 @@ |
| 66 |
get_fcomp |
| 67 |
} |
| 68 |
|
| 69 |
+get_bitness() { |
| 70 |
+ echo > "${T}"/test.c |
| 71 |
+ $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o |
| 72 |
+ case $(file "${T}"/test.o) in |
| 73 |
+ *64-bit*|*ppc64*|*x86_64*) export _bitness="64";; |
| 74 |
+ *32-bit*|*ppc*|*i386*) export _bitness="32";; |
| 75 |
+ *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; |
| 76 |
+ esac |
| 77 |
+} |
| 78 |
+ |
| 79 |
src_prepare() { |
| 80 |
- epatch "${FILESDIR}"/${PV}-gentoo.patch |
| 81 |
- epatch "${FILESDIR}"/${PV}-parallel.patch |
| 82 |
+ epatch \ |
| 83 |
+ "${FILESDIR}"/${PV}-gentoo.patch \ |
| 84 |
+ "${FILESDIR}"/${PV}-parallel.patch |
| 85 |
+ |
| 86 |
+ get_bitness |
| 87 |
|
| 88 |
if use aria; then |
| 89 |
pushd "${WORKDIR}"/aria* >& /dev/null |
| 90 |
@@ -72,17 +85,17 @@ |
| 91 |
use openmp && \ |
| 92 |
append-flags -fopenmp && append-ldflags -fopenmp |
| 93 |
COMP="gfortran" |
| 94 |
- use amd64 && \ |
| 95 |
+ [[ ${_bitness} == 64 ]] && \ |
| 96 |
append-fflags -fdefault-integer-8 |
| 97 |
elif [[ $(tc-getFC) == if* ]]; then |
| 98 |
epatch "${FILESDIR}"/${PV}-ifort.patch |
| 99 |
use openmp && \ |
| 100 |
append-flags -openmp && append-ldflags -openmp |
| 101 |
COMP="ifort" |
| 102 |
- use amd64 && append-fflags -i8 |
| 103 |
+ [[ ${_bitness} == 64 ]] && append-fflags -i8 |
| 104 |
fi |
| 105 |
|
| 106 |
- use amd64 && \ |
| 107 |
+ [[ ${_bitness} == 64 ]] && \ |
| 108 |
append-cflags "-DINTEGER='long long int'" |
| 109 |
|
| 110 |
# Set up location for the build directory |
| 111 |
|
| 112 |
|
| 113 |
|
| 114 |
1.8 sci-chemistry/cns/cns-1.2.1-r5.ebuild |
| 115 |
|
| 116 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r5.ebuild?rev=1.8&view=markup |
| 117 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r5.ebuild?rev=1.8&content-type=text/plain |
| 118 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r5.ebuild?r1=1.7&r2=1.8 |
| 119 |
|
| 120 |
Index: cns-1.2.1-r5.ebuild |
| 121 |
=================================================================== |
| 122 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r5.ebuild,v |
| 123 |
retrieving revision 1.7 |
| 124 |
retrieving revision 1.8 |
| 125 |
diff -u -r1.7 -r1.8 |
| 126 |
--- cns-1.2.1-r5.ebuild 11 May 2011 07:27:13 -0000 1.7 |
| 127 |
+++ cns-1.2.1-r5.ebuild 28 May 2011 12:19:18 -0000 1.8 |
| 128 |
@@ -1,8 +1,8 @@ |
| 129 |
# Copyright 1999-2011 Gentoo Foundation |
| 130 |
# Distributed under the terms of the GNU General Public License v2 |
| 131 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r5.ebuild,v 1.7 2011/05/11 07:27:13 jlec Exp $ |
| 132 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r5.ebuild,v 1.8 2011/05/28 12:19:18 jlec Exp $ |
| 133 |
|
| 134 |
-EAPI="3" |
| 135 |
+EAPI=3 |
| 136 |
|
| 137 |
inherit eutils toolchain-funcs versionator flag-o-matic |
| 138 |
|
| 139 |
@@ -52,9 +52,22 @@ |
| 140 |
get_fcomp |
| 141 |
} |
| 142 |
|
| 143 |
+get_bitness() { |
| 144 |
+ echo > "${T}"/test.c |
| 145 |
+ $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o |
| 146 |
+ case $(file "${T}"/test.o) in |
| 147 |
+ *64-bit*|*ppc64*|*x86_64*) export _bitness="64";; |
| 148 |
+ *32-bit*|*ppc*|*i386*) export _bitness="32";; |
| 149 |
+ *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; |
| 150 |
+ esac |
| 151 |
+} |
| 152 |
+ |
| 153 |
src_prepare() { |
| 154 |
- epatch "${FILESDIR}"/${PV}-gentoo.patch |
| 155 |
- epatch "${FILESDIR}"/${PV}-parallel.patch |
| 156 |
+ epatch \ |
| 157 |
+ "${FILESDIR}"/${PV}-gentoo.patch \ |
| 158 |
+ "${FILESDIR}"/${PV}-parallel.patch |
| 159 |
+ |
| 160 |
+ get_bitness |
| 161 |
|
| 162 |
if use aria; then |
| 163 |
pushd "${WORKDIR}"/aria* >& /dev/null |
| 164 |
@@ -72,19 +85,17 @@ |
| 165 |
use openmp && \ |
| 166 |
append-flags -fopenmp && append-ldflags -fopenmp |
| 167 |
COMP="gfortran" |
| 168 |
- use amd64 && \ |
| 169 |
+ [[ ${_bitness} == 64 ]] && \ |
| 170 |
append-fflags -fdefault-integer-8 |
| 171 |
elif [[ $(tc-getFC) == if* ]]; then |
| 172 |
epatch "${FILESDIR}"/${PV}-ifort.patch |
| 173 |
use openmp && \ |
| 174 |
append-flags -openmp && append-ldflags -openmp |
| 175 |
COMP="ifort" |
| 176 |
- use amd64 && append-fflags -i8 |
| 177 |
- append-fflags -Vaxlib |
| 178 |
- append-ldflags -Vaxlib |
| 179 |
+ [[ ${_bitness} == 64 ]] && append-fflags -i8 |
| 180 |
fi |
| 181 |
|
| 182 |
- use amd64 && \ |
| 183 |
+ [[ ${_bitness} == 64 ]] && \ |
| 184 |
append-cflags "-DINTEGER='long long int'" |
| 185 |
|
| 186 |
# Set up location for the build directory |
| 187 |
|
| 188 |
|
| 189 |
|
| 190 |
1.2 sci-chemistry/cns/cns-1.3_p5.ebuild |
| 191 |
|
| 192 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.3_p5.ebuild?rev=1.2&view=markup |
| 193 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.3_p5.ebuild?rev=1.2&content-type=text/plain |
| 194 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/cns/cns-1.3_p5.ebuild?r1=1.1&r2=1.2 |
| 195 |
|
| 196 |
Index: cns-1.3_p5.ebuild |
| 197 |
=================================================================== |
| 198 |
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.3_p5.ebuild,v |
| 199 |
retrieving revision 1.1 |
| 200 |
retrieving revision 1.2 |
| 201 |
diff -u -r1.1 -r1.2 |
| 202 |
--- cns-1.3_p5.ebuild 13 Feb 2011 12:09:12 -0000 1.1 |
| 203 |
+++ cns-1.3_p5.ebuild 28 May 2011 12:19:18 -0000 1.2 |
| 204 |
@@ -1,8 +1,8 @@ |
| 205 |
# Copyright 1999-2011 Gentoo Foundation |
| 206 |
# Distributed under the terms of the GNU General Public License v2 |
| 207 |
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.3_p5.ebuild,v 1.1 2011/02/13 12:09:12 jlec Exp $ |
| 208 |
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.3_p5.ebuild,v 1.2 2011/05/28 12:19:18 jlec Exp $ |
| 209 |
|
| 210 |
-EAPI="3" |
| 211 |
+EAPI=3 |
| 212 |
|
| 213 |
inherit eutils toolchain-funcs versionator flag-o-matic |
| 214 |
|
| 215 |
@@ -52,11 +52,23 @@ |
| 216 |
get_fcomp |
| 217 |
} |
| 218 |
|
| 219 |
+get_bitness() { |
| 220 |
+ echo > "${T}"/test.c |
| 221 |
+ $(tc-getCC) ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o |
| 222 |
+ case $(file "${T}"/test.o) in |
| 223 |
+ *64-bit*|*ppc64*|*x86_64*) export _bitness="64";; |
| 224 |
+ *32-bit*|*ppc*|*i386*) export _bitness="32";; |
| 225 |
+ *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";; |
| 226 |
+ esac |
| 227 |
+} |
| 228 |
+ |
| 229 |
src_prepare() { |
| 230 |
epatch \ |
| 231 |
"${FILESDIR}"/${PV}-gentoo.patch \ |
| 232 |
"${FILESDIR}"/${PV}-delete.patch |
| 233 |
|
| 234 |
+ get_bitness |
| 235 |
+ |
| 236 |
if use aria; then |
| 237 |
pushd "${WORKDIR}"/aria* >& /dev/null |
| 238 |
# Update the cns sources in aria for version 1.2.1 |
| 239 |
@@ -72,18 +84,16 @@ |
| 240 |
use openmp && \ |
| 241 |
append-flags -fopenmp && append-ldflags -fopenmp |
| 242 |
COMP="gfortran" |
| 243 |
- use amd64 && \ |
| 244 |
+ [[ ${_bitness} == 64 ]] && \ |
| 245 |
append-fflags -fdefault-integer-8 |
| 246 |
elif [[ $(tc-getFC) == if* ]]; then |
| 247 |
use openmp && \ |
| 248 |
append-flags -openmp && append-ldflags -openmp |
| 249 |
COMP="ifort" |
| 250 |
- use amd64 && append-fflags -i8 |
| 251 |
- append-fflags -Vaxlib |
| 252 |
- append-ldflags -Vaxlib |
| 253 |
+ [[ ${_bitness} == 64 ]] && append-fflags -i8 |
| 254 |
fi |
| 255 |
|
| 256 |
- use amd64 && \ |
| 257 |
+ [[ ${_bitness} == 64 ]] && \ |
| 258 |
append-cflags "-DINTEGER='long long int'" |
| 259 |
|
| 260 |
# Set up location for the build directory |
Archives