Re: cannot rebuild python25 -- or really libffi

[Havard Eidnes <he%NetBSD.org@localhost>]

> After the following python update:
>
> ----------------------------
> revision 1.13
> date: 2009/03/20 18:19:20;  author: joerg;  state: Exp;  lines: +4 -2
> Reduce maintaince cost by using our libffi. Bump revision.
> ----------------------------
>
> I got the following when doing a pkg_chk -u on a macppc system running
> NetBSD-current as of about a day ago:
>
> checking for MAP_ANON(YMOUS)... yes
> checking whether mmap with MAP_ANON(YMOUS) works... yes
> configure: error: "libffi has not been ported to powerpc--netbsd."
> *** Error code 1

Yep.  The attached is an attempt at remedying that (as well as update
libffi to the latest version), but still some of the self-tests fail,
and I've not been able to figure out why.  Anyone else have any good
ideas?

Regards,

- Håvard

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libffi/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile    11 Oct 2008 22:33:56 -0000      1.8
+++ Makefile    23 Mar 2009 00:11:53 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.8 2008/10/11 22:33:56 dholland Exp $
 #
 
-DISTNAME=      libffi-3.0.6
+DISTNAME=      libffi-3.0.8
 CATEGORIES=    devel
 MASTER_SITES=  ftp://sourceware.org/pub/libffi/
 
@@ -18,6 +18,8 @@ USE_TOOLS+=   pkg-config
 USE_LANGUAGES= c c++
 INFO_FILES=    # PLIST
 
+TEST_TARGET=   check
+
 PKGCONFIG_OVERRIDE+=   libffi.pc.in
 
 .include "../../mk/bsd.pkg.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/libffi/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo    11 Oct 2008 22:33:56 -0000      1.9
+++ distinfo    23 Mar 2009 00:11:53 -0000
@@ -1,7 +1,10 @@
 $NetBSD: distinfo,v 1.9 2008/10/11 22:33:56 dholland Exp $
 
-SHA1 (libffi-3.0.6.tar.gz) = 04a5f38c76dfe3e078767645ca89f2ff71721104
-RMD160 (libffi-3.0.6.tar.gz) = da8f547209e6b13dc7be86ea29ad5fa5e85844e5
-Size (libffi-3.0.6.tar.gz) = 717171 bytes
+SHA1 (libffi-3.0.8.tar.gz) = ce44d10c39d9a37479c8777e206cac0f36c48712
+RMD160 (libffi-3.0.8.tar.gz) = 4144f64e79ebf95161a6afd58ceaeef8372b5e57
+Size (libffi-3.0.8.tar.gz) = 722834 bytes
 SHA1 (patch-ac) = 307c08e8e3df5f079c0b2f63da58bb59fc089d30
 SHA1 (patch-ad) = 8901a00abe25422e3e35f321a5fb89311185fc0b
+SHA1 (patch-ae) = bf16fd422f2d705324bd8a113f5681252f6c6bdc
+SHA1 (patch-af) = cb6cdffa127f34b1e6f299f76de08bff20ab83dd
+SHA1 (patch-ag) = 1d0f5dbfafeff21db44d305daa96573f827b222a
--- /dev/null   2009-03-22 03:27:06.000000000 +0100
+++ patches/patch-ae    2009-01-18 15:47:54.000000000 +0100
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- configure.ac.orig  2008-12-19 17:12:30.000000000 +0100
++++ configure.ac
+@@ -118,7 +118,7 @@ case "$host" in
+   powerpc-*-aix* | rs6000-*-aix*)
+       TARGET=POWERPC_AIX; TARGETDIR=powerpc
+       ;;
+-  powerpc-*-freebsd*)
++  powerpc-*-freebsd* | powerpc-*-netbsd*)
+       TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
+       ;;
+   powerpc*-*-rtems*)
--- /dev/null   2009-03-22 03:27:06.000000000 +0100
+++ patches/patch-af    2009-01-18 15:48:54.000000000 +0100
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- configure.orig     2009-01-18 15:46:33.000000000 +0100
++++ configure
+@@ -21033,7 +21033,7 @@ case "$host" in
+   powerpc-*-aix* | rs6000-*-aix*)
+       TARGET=POWERPC_AIX; TARGETDIR=powerpc
+       ;;
+-  powerpc-*-freebsd*)
++  powerpc-*-freebsd* | powerpc-*-netbsd*)
+       TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
+       ;;
+   powerpc*-*-rtems*)
--- /dev/null   2009-03-22 03:27:06.000000000 +0100
+++ patches/patch-ag    2009-01-23 18:05:01.000000000 +0100
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- testsuite/libffi.call/float2.c.orig        2008-01-29 16:15:20.000000000 
+0100
++++ testsuite/libffi.call/float2.c
+@@ -44,7 +44,7 @@ int main (void)
+   /* This is ifdef'd out for now. long double support under SunOS/gcc
+      is pretty much non-existent.  You'll get the odd bus error in library
+      routines like printf().  */
+-  printf ("%Lf, %Lf, %Lf, %Lf\n", ld, ldblit(f), ld - ldblit(f), 
LDBL_EPSILON);
++  printf ("%Lf, %Lf, %Lf, %f\n", ld, ldblit(f), ld - ldblit(f), LDBL_EPSILON);
+ #endif
+ 
+   /* These are not always the same!! Check for a reasonable delta */