CVS commit: pkgsrc/devel/libffi

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Dec  8 22:28:37 UTC 2021

Modified Files:
        pkgsrc/devel/libffi: Makefile distinfo
        pkgsrc/devel/libffi/patches: patch-src_aarch64_ffi.c

Log Message:
libffi: fix broken patch; cannot use #ifdef like #if. Bump rev.

Fixes "python2.7: ffi_data_to_code_pointer: not implemented" on aarch64


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/devel/libffi/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/devel/libffi/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/libffi/patches/patch-src_aarch64_ffi.c

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.46 pkgsrc/devel/libffi/Makefile:1.47
--- pkgsrc/devel/libffi/Makefile:1.46   Wed Dec  8 08:20:17 2021
+++ pkgsrc/devel/libffi/Makefile        Wed Dec  8 22:28:36 2021
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2021/12/08 08:20:17 adam Exp $
+# $NetBSD: Makefile,v 1.47 2021/12/08 22:28:36 tnn Exp $
 
 DISTNAME=      libffi-3.4.2
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libffi/}
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}

Index: pkgsrc/devel/libffi/distinfo
diff -u pkgsrc/devel/libffi/distinfo:1.59 pkgsrc/devel/libffi/distinfo:1.60
--- pkgsrc/devel/libffi/distinfo:1.59   Wed Dec  8 08:20:17 2021
+++ pkgsrc/devel/libffi/distinfo        Wed Dec  8 22:28:36 2021
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.59 2021/12/08 08:20:17 adam Exp $
+$NetBSD: distinfo,v 1.60 2021/12/08 22:28:36 tnn Exp $
 
 BLAKE2s (libffi-3.4.2.tar.gz) = a5773b741a815ea113d4b8e2ec62a0ea59a6cfb61367c39bc99276670efd5dfb
 SHA512 (libffi-3.4.2.tar.gz) = 31bad35251bf5c0adb998c88ff065085ca6105cf22071b9bd4b5d5d69db4fadf16cadeec9baca944c4bb97b619b035bb8279de8794b922531fddeb0779eb7fb1
 Size (libffi-3.4.2.tar.gz) = 1351355 bytes
 SHA1 (patch-configure) = 604b205963e01c2dce7d5636543920abdd9c8638
 SHA1 (patch-configure_host) = a4c99cd0fbbbe0f2c806d662b85a6e2c56b31168
-SHA1 (patch-src_aarch64_ffi.c) = a13638a78280f32c4da828ec560ce7a70bb71474
+SHA1 (patch-src_aarch64_ffi.c) = 016c504c55780a89ad2ecf17fea2355c9d1ac06d
 SHA1 (patch-src_arm_sysv.S) = 9aaa8e12e627d68126fbc4ff02e06ed45c94da1a
 SHA1 (patch-src_closures.c) = 13c426ad678439d2781477aa2b10497a22223427
 SHA1 (patch-src_m68k_ffi.c) = 5179cfd150bc7de15eb1c5ee0a327016c2c32b3e

Index: pkgsrc/devel/libffi/patches/patch-src_aarch64_ffi.c
diff -u pkgsrc/devel/libffi/patches/patch-src_aarch64_ffi.c:1.2 pkgsrc/devel/libffi/patches/patch-src_aarch64_ffi.c:1.3
--- pkgsrc/devel/libffi/patches/patch-src_aarch64_ffi.c:1.2     Wed Dec  8 08:20:17 2021
+++ pkgsrc/devel/libffi/patches/patch-src_aarch64_ffi.c Wed Dec  8 22:28:37 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_aarch64_ffi.c,v 1.2 2021/12/08 08:20:17 adam Exp $
+$NetBSD: patch-src_aarch64_ffi.c,v 1.3 2021/12/08 22:28:37 tnn Exp $
 
 For closures, aarch64 needs explicit invalidation of the code segments
 i-cache after data is written through the data mapping.
@@ -12,7 +12,7 @@ right now so for now skip doing the cach
  
    /* Also flush the cache for code mapping.  */
 -#ifdef _WIN32
-+#ifdef _WIN32 || defined(__NetBSD__)
++#if defined(_WIN32) || defined(__NetBSD__)
 +  // ffi_data_to_code_pointer is broken on NetBSD
    // Not using dlmalloc.c for Windows ARM64 builds
    // so calling ffi_data_to_code_pointer() isn't necessary