From nobody Sun Sep 24 20:32:22 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RtyNl0srTz4vQHj; Sun, 24 Sep 2023 20:32:23 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtyNk74pvz4PCm; Sun, 24 Sep 2023 20:32:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695587543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qu5vdwwzOpxdfc2VBsLCJAIusLNZtTmLOi0suWeXScU=; b=SzSFt/owBUXvD58ytu4S57BcqABmGtc2HhuAPp1K8cNVYopJ0qXY+Wgyy3Rm1A/SOnY3J7 Az/qamP3FvQ8/wZURZbHvrHPBTWSVF5gxdlBWk2FpQIlEnibZq8L2HBlRzzUPIHaVNjpaZ 4MKdJwq+dYDwmuyrY4IoaiQYUtoKCycO5TGZm1AkmL3FXbzu8IUIt4BgSseX6V/w+FVBto Fd2HbodxEkIdst+J/I5ELA1O3ZO6ePoeRsSc2VycAgyEpr2ZV5bM789AAJ5kMXm98zl6gA Wxv/eKgP+RuvZUnIRv5u5LqZWuFeX5UW36w5/bgBDdXBR1DUM9NsBiDjFqujNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695587543; a=rsa-sha256; cv=none; b=Kn1UMPfazyk5f10ms6eZDZ9DXQQZjeVSHQabaiYJYmByN+TkT6mCaZavUTh5vKBK626L9P 8gQtnZeGyMHWIinS8hkVox9XliTEotPelA5INvigNYgDCmsgjoVb40EOfprHuTWsaPZpQZ IPwM9GaB1YrlIfXXF9R3n+0KEdSLsgdNuH+lI6zU51ExSnueWmgpSChlYs3GfTVZrhoDsf 4dR9Lr4iIa/F/R6hcDx7Q95wOuFTIU84WGRsviizLF/GzPWtVtHHs4Y81I/U+PI17uhrWn EfI02AVC5BLpK+cirh5FS4JXpblxRHoGDtm2+TpJXs16InctvT/HtZ0OBvBr7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695587543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qu5vdwwzOpxdfc2VBsLCJAIusLNZtTmLOi0suWeXScU=; b=jtohQkPHc6X8n59U5P16DHoB+OZZfklUhXssj4XZndTLgZjsvtIe8iP31Z/g+FK5dDOLpI GIAm+B4pC9s0gKBkuwqo6abzpydOEIvOvhRpmu6Wi+2NROu/zP3kKcfCiFYk0hx72N+Ek3 GTtTwVyKcGKFwp4bEKmJvw4AkT/70EST93ZAs6K62ZqyX2GFst6lgaCiw89j5Bkq88AHGS BDVQy3Ji5SDG4T2Sc3xQlPO3TzaBYXM1goH5GwIoxz1nhLfhC1KW6F6qPVCZ0w39WoRxTB yL6Kh6XrtedZG0tF79CwYL6Wg+D8SzBozhAb+HwJzWURJfIhvMlfZXaih4kglg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RtyNk68FFz11tl; Sun, 24 Sep 2023 20:32:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38OKWMvp012579; Sun, 24 Sep 2023 20:32:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38OKWM3c012576; Sun, 24 Sep 2023 20:32:22 GMT (envelope-from git) Date: Sun, 24 Sep 2023 20:32:22 GMT Message-Id: <202309242032.38OKWM3c012576@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 0cff34eb46ae - main - devel/libffi: fix build with lld 17 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0cff34eb46ae4c1bfc4a041c730524500a628986 Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/ports/commit/?id=0cff34eb46ae4c1bfc4a041c730524500a628986 commit 0cff34eb46ae4c1bfc4a041c730524500a628986 Author: Dimitry Andric AuthorDate: 2023-09-23 20:05:49 +0000 Commit: Dimitry Andric CommitDate: 2023-09-24 20:31:15 +0000 devel/libffi: fix build with lld 17 As reported in bug 273753#c12, devel/libffi fails to link with lld 17, at least on i386: libtool: link: cc -shared -fPIC -DPIC src/.libs/prep_cif.o src/.libs/types.o src/.libs/raw_api.o src/.libs/java_raw_api.o src/.libs/closures.o src/.libs/tramp.o src/x86/.libs/ffi.o src/x86/.libs/sysv.o -O2 -fstack-protector-strong -Wl,--version-script -Wl,libffi.map -fstack-protector-strong -Wl,-soname -Wl,libffi.so.8 -o .libs/libffi.so.8.1.2 ld: error: version script assignment of 'LIBFFI_BASE_8.0' to symbol 'ffi_java_raw_call' failed: symbol not defined ld: error: version script assignment of 'LIBFFI_CLOSURE_8.0' to symbol 'ffi_prep_java_raw_closure' failed: symbol not defined ld: error: version script assignment of 'LIBFFI_CLOSURE_8.0' to symbol 'ffi_prep_java_raw_closure_loc' failed: symbol not defined cc: error: linker command failed with exit code 1 (use -v to see invocation) This is because the symbols it complains about are not implemented on i386, due to the FFI_NATIVE_RAW_API define being nonzero. Fix it by adding more #if statements to libffi.map.in. PR: 274056 Approved by: kbowling (maintainer) MFH: 2023Q3 --- devel/libffi/files/patch-libffi.map.in | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/devel/libffi/files/patch-libffi.map.in b/devel/libffi/files/patch-libffi.map.in new file mode 100644 index 000000000000..25c8b32c7ece --- /dev/null +++ b/devel/libffi/files/patch-libffi.map.in @@ -0,0 +1,23 @@ +--- libffi.map.in.orig 2022-10-23 15:23:27 UTC ++++ libffi.map.in +@@ -33,7 +33,9 @@ LIBFFI_BASE_8.0 { + ffi_raw_to_ptrarray; + ffi_raw_size; + ++#if !FFI_NATIVE_RAW_API + ffi_java_raw_call; ++#endif + ffi_java_ptrarray_to_raw; + ffi_java_raw_to_ptrarray; + ffi_java_raw_size; +@@ -62,8 +64,10 @@ LIBFFI_CLOSURE_8.0 { + ffi_prep_closure_loc; + ffi_prep_raw_closure; + ffi_prep_raw_closure_loc; ++#if !FFI_NATIVE_RAW_API + ffi_prep_java_raw_closure; + ffi_prep_java_raw_closure_loc; ++#endif + } LIBFFI_BASE_8.0; + #endif +