Don't use pre-generated assembly on SunOS. Fixes 64-bit build.

4 files changed, 52 insertions, 7 deletions

diff --git a/devel/ffcall/distinfo b/devel/ffcall/distinfo
index e768e7a2ec9..3a96f41280a 100644
--- a/devel/ffcall/distinfo
+++ b/devel/ffcall/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.8 2008/03/03 21:41:30 tnn Exp $
+$NetBSD: distinfo,v 1.9 2014/05/12 13:05:21 jperkin Exp $
 
 SHA1 (ffcall-1.10.tar.gz) = 6b4fdc7bd38b434bbf3d65508a3d117fc8b349f3
 RMD160 (ffcall-1.10.tar.gz) = 910af54fae0b992ceb5620f155e301827d2e03c5
 Size (ffcall-1.10.tar.gz) = 914870 bytes
-SHA1 (patch-aa) = 1aef05b97cf4da460325caddf9410dc7c1917d76
+SHA1 (patch-aa) = 13250616ed04a1a2135d7638dd6a83f86e635188
 SHA1 (patch-ab) = 7e4b587a080af5530c7bd883a71b614162522320
 SHA1 (patch-ad) = 4cfba7c4ce9fb709d1e857433c5caad293ca9c29
-SHA1 (patch-ae) = 183b4e0dcd194a47fd94c19573ffd698bab14392
-SHA1 (patch-af) = cff72d52332759b42f09acded753b08043b8aefc
+SHA1 (patch-ae) = 120d3104aa4e06a0dcc3119719998e0f260ffb79
+SHA1 (patch-af) = bec1789b42136929742e7bbaa73b88aaf102da6d
 SHA1 (patch-ag) = b21d51fc1d78d81a4f7a99183ca1033675ff04ac
 SHA1 (patch-ah) = 07781ee5caef0ca98e9f15c504fee0b43a111245
 SHA1 (patch-ai) = 03a5a572e94ddbcb78dd11201e0afd91998d1e3a
diff --git a/devel/ffcall/patches/patch-aa b/devel/ffcall/patches/patch-aa
index 8b66540ba96..10f37fa166f 100644
--- a/devel/ffcall/patches/patch-aa
+++ b/devel/ffcall/patches/patch-aa
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2004/03/02 16:05:01 adam Exp $
+$NetBSD: patch-aa,v 1.3 2014/05/12 13:05:21 jperkin Exp $
+
+Don't use pre-generated assembly on SunOS.
 
 --- avcall/Makefile.in.orig	2004-01-25 17:34:21.000000000 +0000
 +++ avcall/Makefile.in
@@ -13,3 +15,16 @@ $NetBSD: patch-aa,v 1.2 2004/03/02 16:05:01 adam Exp $
  
  avcall-m88k.lo : $(srcdir)/avcall-m88k.s
  	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/avcall-m88k.s
+@@ -138,7 +138,11 @@ avcall-ia64.lo : $(srcdir)/avcall-ia64.s
+ 	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/avcall-ia64.s
+ 
+ avcall-x86_64.lo : $(srcdir)/avcall-x86_64.s
+-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/avcall-x86_64.s
++	case "$(OS)" in \
++	  solaris*) xnone=""; exten="c";; \
++	  *) xnone="@GCC_X_NONE@"; exten="s";; \
++	esac; \
++	$(LIBTOOL_COMPILE) $(CC) $${xnone} -c $(srcdir)/avcall-x86_64.$${exten}
+ 
+ structcpy.lo : $(srcdir)/structcpy.c
+ 	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) -c $(srcdir)/structcpy.c
diff --git a/devel/ffcall/patches/patch-ae b/devel/ffcall/patches/patch-ae
index 166b1373c82..bfdc4759fda 100644
--- a/devel/ffcall/patches/patch-ae
+++ b/devel/ffcall/patches/patch-ae
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2004/03/02 16:05:01 adam Exp $
+$NetBSD: patch-ae,v 1.3 2014/05/12 13:05:21 jperkin Exp $
+
+Don't use pre-generated assembly on SunOS.
 
 --- callback/vacall_r/Makefile.in.orig	2004-01-25 14:17:01.000000000 +0000
 +++ callback/vacall_r/Makefile.in
@@ -18,3 +20,16 @@ $NetBSD: patch-ae,v 1.2 2004/03/02 16:05:01 adam Exp $
  
  vacall-m88k.lo : $(srcdir)/vacall-m88k.s
  	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-m88k.s
+@@ -138,7 +139,11 @@ vacall-ia64.lo : $(srcdir)/vacall-ia64.s
+ 	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-ia64.s
+ 
+ vacall-x86_64.lo : $(srcdir)/vacall-x86_64.s
+-	$(LIBTOOL_COMPILE) $(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-x86_64.s
++	case "$(OS)" in \
++	  solaris*) xnone="-I../../vacall"; exten="c";; \
++	  *) xnone="@GCC_X_NONE@"; exten="s";; \
++	esac; \
++	$(LIBTOOL_COMPILE) $(CC) $${xnone} -c $(srcdir)/vacall-x86_64.$${exten}
+ 
+ misc.lo : $(srcdir)/misc.c vacall_r.h config.h
+ 	$(LIBTOOL_COMPILE) $(CC) $(CFLAGS) $(INCLUDES) -c $(srcdir)/misc.c
diff --git a/devel/ffcall/patches/patch-af b/devel/ffcall/patches/patch-af
index 2570e6fdecc..5b17cff6fae 100644
--- a/devel/ffcall/patches/patch-af
+++ b/devel/ffcall/patches/patch-af
@@ -1,4 +1,6 @@
-$NetBSD: patch-af,v 1.2 2004/03/02 16:05:01 adam Exp $
+$NetBSD: patch-af,v 1.3 2014/05/12 13:05:21 jperkin Exp $
+
+Don't use pre-generated assembly on SunOS.
 
 --- vacall/Makefile.in.orig	2004-01-25 13:46:00.000000000 +0000
 +++ vacall/Makefile.in
@@ -11,3 +13,16 @@ $NetBSD: patch-af,v 1.2 2004/03/02 16:05:01 adam Exp $
  
  vacall-m88k.o : $(srcdir)/vacall-m88k.s
  	$(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-m88k.s
+@@ -128,7 +128,11 @@ vacall-ia64.o : $(srcdir)/vacall-ia64.s
+ 	$(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-ia64.s
+ 
+ vacall-x86_64.o : $(srcdir)/vacall-x86_64.s
+-	$(CC) @GCC_X_NONE@ -c $(srcdir)/vacall-x86_64.s
++	case "$(OS)" in \
++	  solaris*) xnone=""; exten="c";; \
++	  *) xnone="@GCC_X_NONE@"; exten="s";; \
++	esac; \
++	$(CC) $${xnone} -c $(srcdir)/vacall-x86_64.$${exten}
+ 
+ misc.o : $(srcdir)/misc.c vacall.h config.h
+ 	$(CC) $(CFLAGS) $(INCLUDES) -c $(srcdir)/misc.c