diff options
author | jperkin <jperkin@pkgsrc.org> | 2016-01-25 17:56:38 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2016-01-25 17:56:38 +0000 |
commit | a98150ee0862668693ff115a7a50a479eaefe539 (patch) | |
tree | 64019fd7f899048e77b01dfbcc2df434949bd49d /devel/libffi | |
parent | 0287ec43b770bac7c60bba68ba91b98349034a43 (diff) | |
download | pkgsrc-a98150ee0862668693ff115a7a50a479eaefe539.tar.gz |
Fix GNU triplet match for Solaris to indicate that writeable and executable
heap is not supported. Fixes complete test failure on x86_64.
Update patch offsets and comments while here. Bump PKGREVISION.
Diffstat (limited to 'devel/libffi')
-rw-r--r-- | devel/libffi/Makefile | 3 | ||||
-rw-r--r-- | devel/libffi/distinfo | 22 | ||||
-rw-r--r-- | devel/libffi/patches/patch-aa | 7 | ||||
-rw-r--r-- | devel/libffi/patches/patch-ac | 8 | ||||
-rw-r--r-- | devel/libffi/patches/patch-ad | 4 | ||||
-rw-r--r-- | devel/libffi/patches/patch-ae | 4 | ||||
-rw-r--r-- | devel/libffi/patches/patch-af | 14 | ||||
-rw-r--r-- | devel/libffi/patches/patch-ag | 6 | ||||
-rw-r--r-- | devel/libffi/patches/patch-aj | 8 | ||||
-rw-r--r-- | devel/libffi/patches/patch-src_alpha_osf.S | 6 | ||||
-rw-r--r-- | devel/libffi/patches/patch-src_arm_sysv.S | 6 | ||||
-rw-r--r-- | devel/libffi/patches/patch-src_m88k_elfbsd.S | 6 |
12 files changed, 52 insertions, 42 deletions
diff --git a/devel/libffi/Makefile b/devel/libffi/Makefile index 10df95fa6b5..e27580c9081 100644 --- a/devel/libffi/Makefile +++ b/devel/libffi/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2015/03/07 16:37:51 tnn Exp $ +# $NetBSD: Makefile,v 1.28 2016/01/25 17:56:38 jperkin Exp $ DISTNAME= libffi-3.2.1 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://sourceware.org/pub/libffi/ diff --git a/devel/libffi/distinfo b/devel/libffi/distinfo index 01560dfb9b2..bed08a46053 100644 --- a/devel/libffi/distinfo +++ b/devel/libffi/distinfo @@ -1,17 +1,17 @@ -$NetBSD: distinfo,v 1.41 2015/11/03 03:27:40 agc Exp $ +$NetBSD: distinfo,v 1.42 2016/01/25 17:56:38 jperkin Exp $ SHA1 (libffi-3.2.1.tar.gz) = 280c265b789e041c02e5c97815793dfc283fb1e6 RMD160 (libffi-3.2.1.tar.gz) = 9b546a3d002380bec3f00d86fc47d730abf51dfd SHA512 (libffi-3.2.1.tar.gz) = 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 Size (libffi-3.2.1.tar.gz) = 940837 bytes -SHA1 (patch-aa) = 7748465dc903b53568999fc8e0caf4ea3fbc5778 -SHA1 (patch-ac) = f3c6324f4334d23e684b4eca25173a13be5d37eb -SHA1 (patch-ad) = 8bb3ec9ea69a8c06b0b1963b3f24018c6384c249 -SHA1 (patch-ae) = 3d8cd3bcd834876f6e60ae519dca8c0b0ba0d4d1 -SHA1 (patch-af) = 2c7ca79ef980a2561333bf79a18df1ecb0bbb9f7 -SHA1 (patch-ag) = 6333317170f6e92f89db966315276dcd8e3484f2 -SHA1 (patch-aj) = d130b2b20b94ca26c70dcc46614e36c6d0ac9153 -SHA1 (patch-src_alpha_osf.S) = 3fa2aab1924bc445fa2f76835c3fd38e5a3898f9 -SHA1 (patch-src_arm_sysv.S) = ea294af156566c6e6f63810358de89cba6213c4f -SHA1 (patch-src_m88k_elfbsd.S) = fae3e425dcff3e924ef195eab165f9bbc6ec4077 +SHA1 (patch-aa) = 5218c8d895f97c812b7ca8d07c55b82ebcdc87d4 +SHA1 (patch-ac) = 63fba2e9486b73485a4f633927f5041110c43239 +SHA1 (patch-ad) = db57395ff721d7b56edec8a3a64b4b529258341c +SHA1 (patch-ae) = cf294d57eb0c8aa11033ec9ec26bc7b73c43cba2 +SHA1 (patch-af) = d7dbe79be31cbcc5726269b26271bd0e598e47fd +SHA1 (patch-ag) = ae6a89f6b2be00c52139be6dcd14d0ebfe85d8f7 +SHA1 (patch-aj) = 5179cfd150bc7de15eb1c5ee0a327016c2c32b3e +SHA1 (patch-src_alpha_osf.S) = 50d564a1d88284f04f6896719fa3613e9b0be70b +SHA1 (patch-src_arm_sysv.S) = 2c97e0d069a4df2e1f5b6604e54b2d02c92691e2 +SHA1 (patch-src_m88k_elfbsd.S) = 6572c7fa39c00096cb4a80bb88993ff1b4aaa8cc SHA1 (patch-src_x86_win32.S) = 8a41cbc7237d6a171605a66e91d8d92a57181569 diff --git a/devel/libffi/patches/patch-aa b/devel/libffi/patches/patch-aa index ee06052ac2e..cc26834c673 100644 --- a/devel/libffi/patches/patch-aa +++ b/devel/libffi/patches/patch-aa @@ -1,4 +1,7 @@ -$NetBSD: patch-aa,v 1.23 2014/11/19 13:49:35 wiz Exp $ +$NetBSD: patch-aa,v 1.24 2016/01/25 17:56:39 jperkin Exp $ + +Add more platforms to list which don't support writeable and executable heap. +Other various platform changes. --- configure.orig 2014-11-12 11:59:57.000000000 +0000 +++ configure @@ -82,7 +85,7 @@ $NetBSD: patch-aa,v 1.23 2014/11/19 13:49:35 wiz Exp $ ;; - *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris*) -+ *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-netbsd* | *-*-openbsd* | *-pc-solaris*) ++ *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-netbsd* | *-*-openbsd* | *-*-solaris*) $as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h diff --git a/devel/libffi/patches/patch-ac b/devel/libffi/patches/patch-ac index 5fd6bf8d70a..69ea7b4b6ed 100644 --- a/devel/libffi/patches/patch-ac +++ b/devel/libffi/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.2 2010/01/16 16:28:58 asau Exp $ +$NetBSD: patch-ac,v 1.3 2016/01/25 17:56:39 jperkin Exp $ Install header files in backwards compatible way. ---- include/Makefile.in.orig 2009-12-31 15:41:01.000000000 +0300 -+++ include/Makefile.in 2010-01-12 12:43:57.000000000 +0300 -@@ -203,7 +203,7 @@ +--- include/Makefile.in.orig 2014-11-12 11:59:58.000000000 +0000 ++++ include/Makefile.in +@@ -314,7 +314,7 @@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign DISTCLEANFILES = ffitarget.h EXTRA_DIST = ffi.h.in ffi_common.h diff --git a/devel/libffi/patches/patch-ad b/devel/libffi/patches/patch-ad index 5e650855c69..06a2d0e8cc7 100644 --- a/devel/libffi/patches/patch-ad +++ b/devel/libffi/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2014/10/28 12:51:03 adam Exp $ +$NetBSD: patch-ad,v 1.3 2016/01/25 17:56:39 jperkin Exp $ Install header files in backwards compatible way. ---- libffi.pc.in.orig 2014-04-25 17:45:13.000000000 +0000 +--- libffi.pc.in.orig 2014-11-08 12:47:24.000000000 +0000 +++ libffi.pc.in @@ -2,7 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ diff --git a/devel/libffi/patches/patch-ae b/devel/libffi/patches/patch-ae index 8ca294a9df1..a0e547c46eb 100644 --- a/devel/libffi/patches/patch-ae +++ b/devel/libffi/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.6 2014/02/11 07:21:28 dholland Exp $ +$NetBSD: patch-ae,v 1.7 2016/01/25 17:56:39 jperkin Exp $ Make a minimal adjustment to support the various NetBSD mips ports. ---- src/mips/ffitarget.h.orig 2012-04-12 02:46:06.000000000 +0000 +--- src/mips/ffitarget.h.orig 2014-11-08 12:47:24.000000000 +0000 +++ src/mips/ffitarget.h @@ -32,7 +32,7 @@ #error "Please do not include ffitarget.h directly into your source. Use ffi.h instead." diff --git a/devel/libffi/patches/patch-af b/devel/libffi/patches/patch-af index 3b6ed649b18..5527da8058e 100644 --- a/devel/libffi/patches/patch-af +++ b/devel/libffi/patches/patch-af @@ -1,9 +1,9 @@ -$NetBSD: patch-af,v 1.3 2012/09/14 23:45:27 asau Exp $ +$NetBSD: patch-af,v 1.4 2016/01/25 17:56:39 jperkin Exp $ Fixes to support the various NetBSD mips ports. ---- src/mips/ffi.c.orig 2011-08-23 18:28:08.000000000 +0400 -+++ src/mips/ffi.c 2012-02-19 20:04:17.000000000 +0400 +--- src/mips/ffi.c.orig 2014-11-08 12:47:24.000000000 +0000 ++++ src/mips/ffi.c @@ -33,12 +33,17 @@ #ifdef __GNUC__ @@ -24,7 +24,7 @@ Fixes to support the various NetBSD mips ports. # include <mips64/sysarch.h> # else # include <sys/cachectl.h> -@@ -465,6 +470,7 @@ +@@ -472,6 +477,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif ((cif->arg_types)[index]->type << (arg_reg * FFI_FLAG_BITS)); arg_reg++; break; @@ -32,7 +32,7 @@ Fixes to support the various NetBSD mips ports. case FFI_TYPE_LONGDOUBLE: /* Align it. */ arg_reg = ALIGN(arg_reg, 2); -@@ -483,7 +489,7 @@ +@@ -490,7 +496,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif arg_reg++; } break; @@ -41,7 +41,7 @@ Fixes to support the various NetBSD mips ports. case FFI_TYPE_STRUCT: loc = arg_reg * FFI_SIZEOF_ARG; cif->flags += calc_n32_struct_flags(soft_float, -@@ -545,6 +551,7 @@ +@@ -552,6 +558,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif cif->flags += cif->rtype->type << (FFI_FLAG_BITS * 8); break; @@ -49,7 +49,7 @@ Fixes to support the various NetBSD mips ports. case FFI_TYPE_LONGDOUBLE: /* Long double is returned as if it were a struct containing two doubles. */ -@@ -561,6 +568,7 @@ +@@ -568,6 +575,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif << (4 + (FFI_FLAG_BITS * 8)); } break; diff --git a/devel/libffi/patches/patch-ag b/devel/libffi/patches/patch-ag index 6033bfbc3fe..84acda30537 100644 --- a/devel/libffi/patches/patch-ag +++ b/devel/libffi/patches/patch-ag @@ -1,10 +1,10 @@ -$NetBSD: patch-ag,v 1.1 2009/05/26 12:27:12 he Exp $ +$NetBSD: patch-ag,v 1.2 2016/01/25 17:56:39 jperkin Exp $ The %Lf printf format expects "long double", so cast args accordingly. ---- testsuite/libffi.call/float2.c.orig 2008-01-29 16:15:20.000000000 +0100 +--- testsuite/libffi.call/float2.c.orig 2014-11-08 12:47:24.000000000 +0000 +++ testsuite/libffi.call/float2.c -@@ -44,7 +44,7 @@ int main (void) +@@ -45,7 +45,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(). */ diff --git a/devel/libffi/patches/patch-aj b/devel/libffi/patches/patch-aj index b9a2a25101c..0c4a5899e1e 100644 --- a/devel/libffi/patches/patch-aj +++ b/devel/libffi/patches/patch-aj @@ -1,6 +1,8 @@ -$NetBSD: patch-aj,v 1.4 2012/09/14 23:45:27 asau Exp $ +$NetBSD: patch-aj,v 1.5 2016/01/25 17:56:39 jperkin Exp $ ---- src/m68k/ffi.c.orig 2012-04-12 02:46:06.000000000 +0000 +NetBSD/m68k support. + +--- src/m68k/ffi.c.orig 2014-11-08 12:47:24.000000000 +0000 +++ src/m68k/ffi.c @@ -9,8 +9,11 @@ @@ -15,7 +17,7 @@ $NetBSD: patch-aj,v 1.4 2012/09/14 23:45:27 asau Exp $ #else #include <sys/syscall.h> #ifdef __MINT__ -@@ -335,8 +338,10 @@ ffi_prep_closure_loc (ffi_closure* closu +@@ -345,8 +348,10 @@ ffi_prep_closure_loc (ffi_closure* closu else *(void **)(closure->tramp + 8) = ffi_closure_SYSV; diff --git a/devel/libffi/patches/patch-src_alpha_osf.S b/devel/libffi/patches/patch-src_alpha_osf.S index 2b61bcade8f..ec3901e3b26 100644 --- a/devel/libffi/patches/patch-src_alpha_osf.S +++ b/devel/libffi/patches/patch-src_alpha_osf.S @@ -1,11 +1,11 @@ -$NetBSD: patch-src_alpha_osf.S,v 1.1 2015/01/09 15:10:51 martin Exp $ +$NetBSD: patch-src_alpha_osf.S,v 1.2 2016/01/25 17:56:39 jperkin Exp $ Band-aid update of the alpha asm code to make it compile past the addition of type complex. Someone with clue on the alpha ELF ABI should provide real support for complex arguments. ---- src/alpha/osf.S.orig 2014-11-08 13:47:24.000000000 +0100 -+++ src/alpha/osf.S 2014-12-26 13:02:32.000000000 +0100 +--- src/alpha/osf.S.orig 2014-11-08 12:47:24.000000000 +0000 ++++ src/alpha/osf.S @@ -279,6 +279,7 @@ $load_table: .gprel32 $load_64 # FFI_TYPE_SINT64 .gprel32 $load_none # FFI_TYPE_STRUCT diff --git a/devel/libffi/patches/patch-src_arm_sysv.S b/devel/libffi/patches/patch-src_arm_sysv.S index bb1663be10d..ac8afad3660 100644 --- a/devel/libffi/patches/patch-src_arm_sysv.S +++ b/devel/libffi/patches/patch-src_arm_sysv.S @@ -1,6 +1,8 @@ -$NetBSD: patch-src_arm_sysv.S,v 1.6 2014/11/10 21:29:40 joerg Exp $ +$NetBSD: patch-src_arm_sysv.S,v 1.7 2016/01/25 17:56:39 jperkin Exp $ ---- src/arm/sysv.S.orig 2014-04-25 17:45:13.000000000 +0000 +ARM fixes. + +--- src/arm/sysv.S.orig 2014-11-08 12:47:24.000000000 +0000 +++ src/arm/sysv.S @@ -25,6 +25,8 @@ DEALINGS IN THE SOFTWARE. diff --git a/devel/libffi/patches/patch-src_m88k_elfbsd.S b/devel/libffi/patches/patch-src_m88k_elfbsd.S index 644ce2c221b..943d22a337e 100644 --- a/devel/libffi/patches/patch-src_m88k_elfbsd.S +++ b/devel/libffi/patches/patch-src_m88k_elfbsd.S @@ -1,6 +1,8 @@ -$NetBSD: patch-src_m88k_elfbsd.S,v 1.1 2013/11/03 23:51:51 jklos Exp $ +$NetBSD: patch-src_m88k_elfbsd.S,v 1.2 2016/01/25 17:56:39 jperkin Exp $ ---- src/m88k/elfbsd.S.orig 2013-11-03 22:57:57.000000000 +0000 +m88k support. + +--- src/m88k/elfbsd.S.orig 2016-01-25 17:24:51.000000000 +0000 +++ src/m88k/elfbsd.S @@ -0,0 +1,195 @@ +/* |