From owner-svn-ports-all@freebsd.org Sat Jul 4 18:09:41 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0B362354B34; Sat, 4 Jul 2020 18:09:41 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49zfxJ621zz40k7; Sat, 4 Jul 2020 18:09:40 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 98A03203E7; Sat, 4 Jul 2020 18:09:40 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 064I9eG6062043; Sat, 4 Jul 2020 18:09:40 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 064I9dU2062036; Sat, 4 Jul 2020 18:09:39 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <202007041809.064I9dU2062036@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Sat, 4 Jul 2020 18:09:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541231 - in head/devel/libffi: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head/devel/libffi: . files X-SVN-Commit-Revision: 541231 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jul 2020 18:09:41 -0000 Author: zeising Date: Sat Jul 4 18:09:38 2020 New Revision: 541231 URL: https://svnweb.freebsd.org/changeset/ports/541231 Log: devel/libffi: Update to 3.3.0 Update devel/libffi to 3.3.0 This adds support for RISC-V Changelog: https://github.com/libffi/libffi/releases/tag/v3.3 PR: 247028 (exp-run) Reviewed by: kp, linimon, arrowd exp-run by: antoine Differential Revision: https://reviews.freebsd.org/D25163 Added: head/devel/libffi/files/patch-Makefile.in (contents, props changed) head/devel/libffi/files/patch-configure.host (contents, props changed) Deleted: head/devel/libffi/files/patch-b5ade2 head/devel/libffi/files/patch-configure head/devel/libffi/files/patch-src_arm_sysv.S Modified: head/devel/libffi/Makefile head/devel/libffi/distinfo head/devel/libffi/files/patch-src__arm__ffi.c head/devel/libffi/pkg-descr head/devel/libffi/pkg-plist Modified: head/devel/libffi/Makefile ============================================================================== --- head/devel/libffi/Makefile Sat Jul 4 18:04:00 2020 (r541230) +++ head/devel/libffi/Makefile Sat Jul 4 18:09:38 2020 (r541231) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libffi -PORTVERSION= 3.2.1 -PORTREVISION= 3 +PORTVERSION= 3.3 CATEGORIES= devel MASTER_SITES= SOURCEWARE/${PORTNAME} @@ -19,19 +18,13 @@ USES= libtool pathfix USE_LDCONFIG= yes GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-multi-os-directory INSTALL_TARGET= install-strip INFO= libffi -PLIST_SUB= PORTVERSION=${PORTVERSION} TEST_TARGET= check post-patch: @${REINPLACE_CMD} -e 's| -Wno-psabi||g' \ ${WRKSRC}/testsuite/lib/libffi.exp - -post-install: - @${LN} -sf ../lib/libffi-${PORTVERSION}/include/ffi.h \ - ${STAGEDIR}${PREFIX}/include/ - @${LN} -sf ../lib/libffi-${PORTVERSION}/include/ffitarget.h \ - ${STAGEDIR}${PREFIX}/include/ .include Modified: head/devel/libffi/distinfo ============================================================================== --- head/devel/libffi/distinfo Sat Jul 4 18:04:00 2020 (r541230) +++ head/devel/libffi/distinfo Sat Jul 4 18:09:38 2020 (r541231) @@ -1,2 +1,3 @@ -SHA256 (libffi-3.2.1.tar.gz) = d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37 -SIZE (libffi-3.2.1.tar.gz) = 940837 +TIMESTAMP = 1575540897 +SHA256 (libffi-3.3.tar.gz) = 72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056 +SIZE (libffi-3.3.tar.gz) = 1305466 Added: head/devel/libffi/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libffi/files/patch-Makefile.in Sat Jul 4 18:09:38 2020 (r541231) @@ -0,0 +1,16 @@ +This patch is based on the following upstream patch +From 0027b072627aa9d3ada71c4374561966064ecd5a Mon Sep 17 00:00:00 2001 +From: "M. Herdiansyah" +Date: Thu, 11 Jun 2020 19:40:24 +0700 +Subject: [PATCH] Makefile: increase compatibility with bmake (#551) +--- Makefile.in.orig 2020-07-04 16:53:39 UTC ++++ Makefile.in +@@ -2012,7 +2012,7 @@ uninstall-am: uninstall-pkgconfigDATA uninstall-toolex + @LIBFFI_BUILD_VERSIONED_SHLIB_SUN_TRUE@@LIBFFI_BUILD_VERSIONED_SHLIB_TRUE@ > $@ || (rm -f $@ ; exit 1) + + libffi.map: $(top_srcdir)/libffi.map.in +- $(COMPILE) -D$(TARGET) -E -x assembler-with-cpp -o $@ $< ++ $(COMPILE) -D$(TARGET) -E -x assembler-with-cpp -o $@ $(top_srcdir)/libffi.map.in + + dist-hook: + d=`(cd $(distdir); pwd)`; (cd doc; make pdf; cp *.pdf $$d/doc) Added: head/devel/libffi/files/patch-configure.host ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libffi/files/patch-configure.host Sat Jul 4 18:09:38 2020 (r541231) @@ -0,0 +1,22 @@ +--- configure.host.orig 2019-11-22 23:55:36 UTC ++++ configure.host +@@ -167,7 +167,7 @@ case "${host}" in + mips-sgi-irix5.* | mips-sgi-irix6.* | mips*-*-rtems*) + TARGET=MIPS; TARGETDIR=mips + ;; +- mips*-*linux* | mips*-*-openbsd*) ++ mips*-*linux* | mips*-*-openbsd* | mips*-*-freebsd*) + # Support 128-bit long double for NewABI. + HAVE_LONG_DOUBLE='defined(__mips64)' + TARGET=MIPS; TARGETDIR=mips +@@ -202,6 +202,10 @@ case "${host}" in + powerpc-*-freebsd* | powerpc-*-openbsd* | powerpc-*-netbsd*) + TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc + HAVE_LONG_DOUBLE_VARIANT=1 ++ ;; ++ powerpcspe-*-freebsd*) ++ TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc ++ CFLAGS="$CFLAGS -D__NO_FPRS__" + ;; + powerpc64-*-freebsd*) + TARGET=POWERPC; TARGETDIR=powerpc Modified: head/devel/libffi/files/patch-src__arm__ffi.c ============================================================================== --- head/devel/libffi/files/patch-src__arm__ffi.c Sat Jul 4 18:04:00 2020 (r541230) +++ head/devel/libffi/files/patch-src__arm__ffi.c Sat Jul 4 18:09:38 2020 (r541231) @@ -3,24 +3,25 @@ # PR: ports/149167 ports/184517 # Patch by: cognet@ (to be upstreamed @ LLVM) ---- ./src/arm/ffi.c.orig 2013-03-16 22:19:39.000000000 +1100 -+++ ./src/arm/ffi.c 2013-12-03 19:30:58.440924300 +1100 -@@ -33,6 +33,11 @@ +--- src/arm/ffi.c.orig 2019-10-31 14:49:54 UTC ++++ src/arm/ffi.c +@@ -55,6 +55,11 @@ extern unsigned int ffi_arm_trampoline[3] FFI_HIDDEN; + #endif + #endif - #include - +#if defined(__FreeBSD__) && defined(__arm__) +#include +#include +#endif + /* Forward declares. */ - static int vfp_type_p (ffi_type *); + static int vfp_type_p (const ffi_type *); static void layout_vfp_args (ffi_cif *); -@@ -582,6 +587,16 @@ +@@ -568,6 +573,16 @@ void ffi_go_closure_SYSV (void) FFI_HIDDEN; + void ffi_go_closure_VFP (void) FFI_HIDDEN; - #else - + /* the cif must already be prep'ed */ ++ +#if defined(__FreeBSD__) && defined(__arm__) +#define __clear_cache(start, end) do { \ + struct arm_sync_icache_args ua; \ @@ -30,7 +31,6 @@ + sysarch(ARM_SYNC_ICACHE, &ua); \ + } while (0); +#endif -+ - #define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX) \ - ({ unsigned char *__tramp = (unsigned char*)(TRAMP); \ - unsigned int __fun = (unsigned int)(FUN); \ + + ffi_status + ffi_prep_closure_loc (ffi_closure * closure, Modified: head/devel/libffi/pkg-descr ============================================================================== --- head/devel/libffi/pkg-descr Sat Jul 4 18:04:00 2020 (r541230) +++ head/devel/libffi/pkg-descr Sat Jul 4 18:09:38 2020 (r541231) @@ -3,4 +3,4 @@ interface to various calling conventions. This allows call any function specified by a call interface description at run time. -WWW: http://sources.redhat.com/libffi/ +WWW: https://sourceware.org/libffi/ Modified: head/devel/libffi/pkg-plist ============================================================================== --- head/devel/libffi/pkg-plist Sat Jul 4 18:04:00 2020 (r541230) +++ head/devel/libffi/pkg-plist Sat Jul 4 18:09:38 2020 (r541231) @@ -1,11 +1,9 @@ include/ffi.h include/ffitarget.h -lib/libffi-%%PORTVERSION%%/include/ffi.h -lib/libffi-%%PORTVERSION%%/include/ffitarget.h lib/libffi.a lib/libffi.so -lib/libffi.so.6 -lib/libffi.so.6.0.4 +lib/libffi.so.7 +lib/libffi.so.7.1.0 libdata/pkgconfig/libffi.pc man/man3/ffi.3.gz man/man3/ffi_call.3.gz