CVS commit: pkgsrc/devel/libffi

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Nov  3 11:40:28 UTC 2016

Modified Files:
        pkgsrc/devel/libffi: Makefile distinfo
        pkgsrc/devel/libffi/patches: patch-ae patch-af

Log Message:
libffi: remove some netbsd/mips specific patches that are uneeded
(and may be harmful).

we don't need a definition to declare we're definitely totally o32,
especially since the vast majority will be n32. this is potentially
harmful, but I cannot confirm any resulting harm.

don't try to avoid compiler builtins, we have them and I expect that
they will work, however, only build tested (on netbsd 7.99.41 mips64eb),
no tests run.

bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/libffi/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/devel/libffi/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/libffi/patches/patch-ae
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/libffi/patches/patch-af

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libffi/Makefile
diff -u pkgsrc/devel/libffi/Makefile:1.28 pkgsrc/devel/libffi/Makefile:1.29
--- pkgsrc/devel/libffi/Makefile:1.28   Mon Jan 25 17:56:38 2016
+++ pkgsrc/devel/libffi/Makefile        Thu Nov  3 11:40:28 2016
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2016/01/25 17:56:38 jperkin Exp $
+# $NetBSD: Makefile,v 1.29 2016/11/03 11:40:28 maya Exp $
 
 DISTNAME=      libffi-3.2.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  ftp://sourceware.org/pub/libffi/
 

Index: pkgsrc/devel/libffi/distinfo
diff -u pkgsrc/devel/libffi/distinfo:1.42 pkgsrc/devel/libffi/distinfo:1.43
--- pkgsrc/devel/libffi/distinfo:1.42   Mon Jan 25 17:56:38 2016
+++ pkgsrc/devel/libffi/distinfo        Thu Nov  3 11:40:28 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2016/01/25 17:56:38 jperkin Exp $
+$NetBSD: distinfo,v 1.43 2016/11/03 11:40:28 maya Exp $
 
 SHA1 (libffi-3.2.1.tar.gz) = 280c265b789e041c02e5c97815793dfc283fb1e6
 RMD160 (libffi-3.2.1.tar.gz) = 9b546a3d002380bec3f00d86fc47d730abf51dfd
@@ -7,8 +7,8 @@ Size (libffi-3.2.1.tar.gz) = 940837 byte
 SHA1 (patch-aa) = 5218c8d895f97c812b7ca8d07c55b82ebcdc87d4
 SHA1 (patch-ac) = 63fba2e9486b73485a4f633927f5041110c43239
 SHA1 (patch-ad) = db57395ff721d7b56edec8a3a64b4b529258341c
-SHA1 (patch-ae) = cf294d57eb0c8aa11033ec9ec26bc7b73c43cba2
-SHA1 (patch-af) = d7dbe79be31cbcc5726269b26271bd0e598e47fd
+SHA1 (patch-ae) = fdb84a49c15041826396e4d3a6dda2de719801c0
+SHA1 (patch-af) = bf64b4082f24947cd47aba0758c347e5ddac3d7e
 SHA1 (patch-ag) = ae6a89f6b2be00c52139be6dcd14d0ebfe85d8f7
 SHA1 (patch-aj) = 5179cfd150bc7de15eb1c5ee0a327016c2c32b3e
 SHA1 (patch-src_alpha_osf.S) = 50d564a1d88284f04f6896719fa3613e9b0be70b

Index: pkgsrc/devel/libffi/patches/patch-ae
diff -u pkgsrc/devel/libffi/patches/patch-ae:1.7 pkgsrc/devel/libffi/patches/patch-ae:1.8
--- pkgsrc/devel/libffi/patches/patch-ae:1.7    Mon Jan 25 17:56:39 2016
+++ pkgsrc/devel/libffi/patches/patch-ae        Thu Nov  3 11:40:28 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.7 2016/01/25 17:56:39 jperkin Exp $
+$NetBSD: patch-ae,v 1.8 2016/11/03 11:40:28 maya Exp $
 
 Make a minimal adjustment to support the various NetBSD mips ports.
 
@@ -25,16 +25,3 @@ Make a minimal adjustment to support the
  #endif
  
  #  ifndef _ABIN32
-@@ -55,6 +57,12 @@
- #    define _ABIO32 _MIPS_SIM_ABI32
- #  endif
- 
-+#ifdef __NetBSD__
-+/* Let's cheat a bit... */   
-+#  define _ABIO32 1     
-+#  define _MIPS_SIM _ABIO32
-+#endif
-+
- #if !defined(_MIPS_SIM)
- # error -- something is very wrong --
- #else

Index: pkgsrc/devel/libffi/patches/patch-af
diff -u pkgsrc/devel/libffi/patches/patch-af:1.4 pkgsrc/devel/libffi/patches/patch-af:1.5
--- pkgsrc/devel/libffi/patches/patch-af:1.4    Mon Jan 25 17:56:39 2016
+++ pkgsrc/devel/libffi/patches/patch-af        Thu Nov  3 11:40:28 2016
@@ -1,29 +1,9 @@
-$NetBSD: patch-af,v 1.4 2016/01/25 17:56:39 jperkin Exp $
+$NetBSD: patch-af,v 1.5 2016/11/03 11:40:28 maya Exp $
 
 Fixes to support the various NetBSD mips ports.
 
 --- src/mips/ffi.c.orig        2014-11-08 12:47:24.000000000 +0000
 +++ src/mips/ffi.c
-@@ -33,12 +33,17 @@
- 
- #ifdef __GNUC__
- #  if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))
--#    define USE__BUILTIN___CLEAR_CACHE 1
-+#    if !defined(__NetBSD__)
-+#      define USE__BUILTIN___CLEAR_CACHE 1
-+#    endif
- #  endif
- #endif
- 
- #ifndef USE__BUILTIN___CLEAR_CACHE
--#  if defined(__OpenBSD__)
-+#  if defined(__NetBSD__)
-+#    include <mips/cachectl.h>
-+#    define cacheflush _cacheflush
-+#  elif defined(__OpenBSD__)
- #    include <mips64/sysarch.h>
- #  else
- #    include <sys/cachectl.h>
 @@ -472,6 +477,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif 
                ((cif->arg_types)[index]->type << (arg_reg * FFI_FLAG_BITS));
            arg_reg++;