fix building on K6 systems

diff --git a/dev-libs/gsl/ChangeLog b/dev-libs/gsl/ChangeLog
index 2919e2f17045022a414a50a3673ba9499e04d43d..788b99f8cc1024bbee90c2ea27e139482a59be22 100644 (file)
--- a/dev-libs/gsl/ChangeLog
+++ b/dev-libs/gsl/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for dev-libs/gsl
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gsl/ChangeLog,v 1.2 2002/08/07 07:42:34 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gsl/ChangeLog,v 1.3 2002/10/19 05:55:12 george Exp $
 
 *gsl-1.2 (06 Aug 2002)
 
+  18 Oct 2002; George Shapovalov <george@gentoo.org> gsl-1.2.ebuild, files/k6-undef.diff :
+
+  fix building on k6 systems. Thanks to Charles G. Waldman <cgw@alum.mit.edu>, #9011
+
   06 Aug 2002; George Shapovalov <george@gentoo.org> gsl-1.2.ebuild, files/digest-gsl-1.2 :
 
   new version, renaiming old ebuild sufficed

diff --git a/dev-libs/gsl/files/k6-undef.diff b/dev-libs/gsl/files/k6-undef.diff
new file mode 100644 (file)
index 0000000..0fc3ac2
--- /dev/null
+++ b/dev-libs/gsl/files/k6-undef.diff
@@ -0,0 +1,43 @@
+diff -u gsl-1.2-r1-orig/ode-initval/rk8pd.c gsl-1.2-r1/ode-initval/rk8pd.c
+--- gsl-1.2-r1-orig/ode-initval/rk8pd.c        2002-10-10 22:22:37.000000000 -0500
++++ gsl-1.2-r1/ode-initval/rk8pd.c     2002-10-11 02:09:26.000000000 -0500
+@@ -29,6 +29,10 @@
+ 
+ #include "odeiv_util.h"
+ 
++/* There is a variable here named k6, make sure it is not
++   defined as processor type */
++#undef k6
++
+ /* Prince-Dormand constants */
+ 
+ static const double Abar[] = {
+diff -u gsl-1.2-r1-orig/ode-initval/rkck.c gsl-1.2-r1/ode-initval/rkck.c
+--- gsl-1.2-r1-orig/ode-initval/rkck.c 2002-10-10 22:21:51.000000000 -0500
++++ gsl-1.2-r1/ode-initval/rkck.c      2002-10-11 02:09:42.000000000 -0500
+@@ -29,6 +29,10 @@
+ 
+ #include "odeiv_util.h"
+ 
++/* There is a variable here named k6, make sure it is not
++   defined as processor type */
++#undef k6
++
+ /* Cash-Karp constants */
+ static const double ah[] = { 1.0 / 5.0, 0.3, 3.0 / 5.0, 1.0, 7.0 / 8.0 };
+ static const double b21 = 1.0 / 5.0;
+diff -u gsl-1.2-r1-orig/ode-initval/rkf45.c gsl-1.2-r1/ode-initval/rkf45.c
+--- gsl-1.2-r1-orig/ode-initval/rkf45.c        2002-10-10 22:22:41.000000000 -0500
++++ gsl-1.2-r1/ode-initval/rkf45.c     2002-10-11 02:07:27.000000000 -0500
+@@ -27,6 +27,11 @@
+ 
+ #include "odeiv_util.h"
+ 
++/* There is a variable here named k6, make sure it is not
++   defined as processor type */
++#undef k6
++
++
+ /* Runge-Kutta-Fehlberg constants */
+ static const double ah[] = { 1.0/4.0, 3.0/8.0, 12.0/13.0, 1.0, 1.0/2.0 };
+ 

diff --git a/dev-libs/gsl/gsl-1.2.ebuild b/dev-libs/gsl/gsl-1.2.ebuild
index 45588be7d04e7a33aca1fb0ab95e2041c51c1b7f..0b01414d3d1f694662a33365bedfd6559e0bf2ee 100644 (file)
--- a/dev-libs/gsl/gsl-1.2.ebuild
+++ b/dev-libs/gsl/gsl-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gsl/gsl-1.2.ebuild,v 1.3 2002/10/04 05:15:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/gsl/gsl-1.2.ebuild,v 1.4 2002/10/19 05:55:13 george Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The GNU Scientific Library"
@@ -14,6 +14,11 @@ KEYWORDS="x86 sparc sparc64"
 DEPEND="virtual/glibc"
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+       unpack ${A}
+       patch -d ${S} -p1 < ${FILESDIR}/k6-undef.diff
+}
+
 src_compile() {
        
 #Avoid locking (can break parallel builds)     
@@ -25,11 +30,12 @@ src_compile() {
 
        #Uncomment the 'make check ...' line if you want to run the test suite.
        #Note that the check.log file will be several megabytes in size.        
-       #       make check > check.log 2>&1 || die
+       #       make check > ${WORKDIR}/check.log 2>&1 || die
 
 }
 
 src_install () {
+
        einstall || die
        dodoc AUTHORS COPYING ChangeLog INSTALL KNOWN-PROBLEMS MACHINES NEWS