Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6883/10.7/stable/main/finkinfo/sci
Modified Files:
nan-oct.info tsa-oct.info
Log Message:
Use %type_pkg[gcc] everywhere for now.
Document issue that blocks the use of gcc48.
Index: nan-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/nan-oct.info,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- nan-oct.info 19 Apr 2013 14:25:11 -0000 1.31
+++ nan-oct.info 19 Apr 2013 15:00:40 -0000 1.32
@@ -81,7 +81,7 @@
(%type_raw[-blas] = .) liboctave%type_pkg[oct]-accelerate-dev,
(%type_raw[-blas] = -ref) lapack%type_pkg[lapack],
(%type_raw[-blas] = -ref) liboctave%type_pkg[oct]-ref-dev,
- gcc47-compiler,
+ gcc%type_pkg[gcc]-compiler,
fink-octave-scripts (>= 0.2.0-1),
fftw3,
hdf5.7
@@ -158,7 +158,27 @@
Patch to Use BLAS_LIBS output from mkoctfile rather than just -lblas.
Wants libgomp; we use gcc47-compiler for that.
-The package doesn't appear to get along with gcc48.
+The package doesn't appear to get along with gcc48:
+
+/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib: In function 'long long int
std::abs(long long int)':
+/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:174:20: error: declaration of C
function 'long long int std::abs(long long int)' conflicts with
+ abs(long long __x) { return __builtin_llabs (__x); }
+ ^
+/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:166:3: error: previous declaration
'long int std::abs(long int)' here
+ abs(long __i) { return __builtin_labs(__i); }
+ ^
+/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib: In function '__int128
std::abs(__int128)':
+/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:179:19: error: declaration of C
function '__int128 std::abs(__int128)' conflicts with
+ abs(__int128 __x) { return __x >= 0 ? __x : -__x; }
+ ^
+/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:174:3: error: previous declaration
'long long int std::abs(long long int)' here
+ abs(long long __x) { return __builtin_llabs (__x); }
+ ^
+/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:179:19: error: declaration of C
function '__int128 std::abs(__int128)' conflicts with
+ abs(__int128 __x) { return __x >= 0 ? __x : -__x; }
+ ^
+/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:166:3: error: previous declaration
'long int std::abs(long int)' here
+ abs(long __i) { return __builtin_labs(__i); }
src/Makefile: patch in the locations of the gcc47-compiler executables and
the
gcc47-enabled mkoctfile.
Index: tsa-oct.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/tsa-oct.info,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- tsa-oct.info 19 Apr 2013 14:25:11 -0000 1.28
+++ tsa-oct.info 19 Apr 2013 15:00:40 -0000 1.29
@@ -73,7 +73,7 @@
BuildDepends: <<
liboctave%type_pkg[oct]-dev,
fink-octave-scripts (>= 0.2.0-1),
- gcc47-compiler,
+ gcc%type_pkg[gcc]-compiler,
fftw3,
( %type_pkg[oct] = 305 ) hdf5.7-oldapi,
( %type_pkg[oct] != 305 ) hdf5.7
@@ -123,8 +123,28 @@
DescPackaging: <<
This package:
-Wants libgomp, so we'll use that from gcc47. The package doesn't seem to get
-along with gcc48.
+Wants libgomp, so we'll use that from gcc47.
+The package doesn't seem to get along with gcc48:
+
+/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib: In function 'long long int
std::abs(long long int)':
+/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:174:20: error: declaration of C
function 'long long int std::abs(long long int)' conflicts with
+ abs(long long __x) { return __builtin_llabs (__x); }
+ ^
+/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:166:3: error: previous declaration
'long int std::abs(long int)' here
+ abs(long __i) { return __builtin_labs(__i); }
+ ^
+/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib: In function '__int128
std::abs(__int128)':
+/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:179:19: error: declaration of C
function '__int128 std::abs(__int128)' conflicts with
+ abs(__int128 __x) { return __x >= 0 ? __x : -__x; }
+ ^
+/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:174:3: error: previous declaration
'long long int std::abs(long long int)' here
+ abs(long long __x) { return __builtin_llabs (__x); }
+ ^
+/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:179:19: error: declaration of C
function '__int128 std::abs(__int128)' conflicts with
+ abs(__int128 __x) { return __x >= 0 ? __x : -__x; }
+ ^
+/sw/lib/gcc4.8/include/c++/4.8.0/cstdlib:166:3: error: previous declaration
'long int std::abs(long int)' here
+ abs(long __i) { return __builtin_labs(__i); }
Common for all octave-forge packages:
We read in postinst and prerm template scripts installed by octaveN and modify
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
