diff options
| author | tnn <tnn@pkgsrc.org> | 2009-12-07 12:15:25 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2009-12-07 12:15:25 +0000 |
| commit | c3633ac19e497b6812b71de08393f32737d6c040 (patch) | |
| tree | b316dd9025f8fbaee233a59e1d25dd6ebbff2ccd /devel/libf2c | |
| parent | b40ef39c46298c482247fef433511e75c8c4674b (diff) | |
| download | pkgsrc-c3633ac19e497b6812b71de08393f32737d6c040.tar.gz | |
Remove the patch-ai which used to fix 64-bit types in f2c.h.
Now it breaks stuff on amd64 instead, notably math/lapack.
NB: This change makes "make test" fail for this package on amd64.
On the other hand, math/fftw (which uses lapack) test suite succeeds.
Maybe tests here are simply broken ...
Bump revision and bl3 dependency.
Diffstat (limited to 'devel/libf2c')
| -rw-r--r-- | devel/libf2c/Makefile | 3 | ||||
| -rw-r--r-- | devel/libf2c/buildlink3.mk | 4 | ||||
| -rw-r--r-- | devel/libf2c/distinfo | 3 | ||||
| -rw-r--r-- | devel/libf2c/patches/patch-ai | 30 |
4 files changed, 5 insertions, 35 deletions
diff --git a/devel/libf2c/Makefile b/devel/libf2c/Makefile index b217dc8c0ea..f5a62a3140e 100644 --- a/devel/libf2c/Makefile +++ b/devel/libf2c/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/12/02 22:32:46 asau Exp $ +# $NetBSD: Makefile,v 1.2 2009/12/07 12:15:25 tnn Exp $ DISTNAME= libf2c-20090201 +PKGREVISION= 1 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_LOCAL} # see notes below diff --git a/devel/libf2c/buildlink3.mk b/devel/libf2c/buildlink3.mk index b4d8d0bf0aa..23c14673984 100644 --- a/devel/libf2c/buildlink3.mk +++ b/devel/libf2c/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/12/02 22:32:46 asau Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2009/12/07 12:15:25 tnn Exp $ BUILDLINK_TREE+= libf2c .if !defined(LIBF2C_BUILDLINK3_MK) LIBF2C_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libf2c+= libf2c>=20090201 +BUILDLINK_API_DEPENDS.libf2c+= libf2c>=20090201nb1 BUILDLINK_PKGSRCDIR.libf2c?= ../../devel/libf2c .endif # LIBF2C_BUILDLINK3_MK diff --git a/devel/libf2c/distinfo b/devel/libf2c/distinfo index 207abd00bd6..3d0f4cc4c44 100644 --- a/devel/libf2c/distinfo +++ b/devel/libf2c/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/12/02 22:32:46 asau Exp $ +$NetBSD: distinfo,v 1.2 2009/12/07 12:15:25 tnn Exp $ SHA1 (libf2c-20090201.tar.gz) = 85bd1602dce67a4d784fa9815c993202b1da3216 RMD160 (libf2c-20090201.tar.gz) = 27fe1476eef9431042b67660120285395850d6a7 Size (libf2c-20090201.tar.gz) = 81983 bytes -SHA1 (patch-ai) = 3524fe7abcfcdcd636c134c0515279f9172dc7dc diff --git a/devel/libf2c/patches/patch-ai b/devel/libf2c/patches/patch-ai deleted file mode 100644 index 80835985b63..00000000000 --- a/devel/libf2c/patches/patch-ai +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ai,v 1.1.1.1 2009/12/02 22:32:47 asau Exp $ - -required to make -sizeof(integer) == sizeof(real) -and -sizeof(logical) == sizeof(real) -(per f2c/readme) - ---- f2c.h0.orig Tue Sep 7 13:46:24 1999 -+++ f2c.h0 Tue Dec 7 18:08:26 1999 -@@ -8,5 +8,9 @@ - #define F2C_INCLUDE - -+#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__sparcv8) || defined(__sparcv9) -+typedef int integer; -+#else - typedef long int integer; -+#endif - typedef unsigned long int uinteger; - typedef char *address; -@@ -16,5 +20,9 @@ - typedef struct { real r, i; } complex; - typedef struct { doublereal r, i; } doublecomplex; -+#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__sparcv8) || defined(__sparcv9) -+typedef int logical; -+#else - typedef long int logical; -+#endif - typedef short int shortlogical; - typedef char logical1; |