From nobody Mon Dec 05 20:09:23 2022 X-Original-To: dev-commits-ports-branches@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 4NQvlS3xzFz4jP21; Mon, 5 Dec 2022 20:09:24 +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 4NQvlS0p1Lz3kVF; Mon, 5 Dec 2022 20:09:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670270964; 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=WidfpUrt23QrgDGt14Yt+WG+fCwTjrKILTrgUwPof2c=; b=D5G0kZ1MEqT6h14Kb9SqvXtu5J0jwDAdN+tsase2C9gxcaTCJ76utXazfNKHJq+zmH4lTr e1NlDG5pH8zgHIzHEiykdpgMi2z6eL7RCN/GEJzrx1DcLnya3f87omVtyxxHlvuAzyAcNm 9IHGOHA30wJrbYMgQ5tiivbmFqxfJVahPjLclsmXP9an7ecjZHF4R2lKJFUyrOLIw8hiB7 4Wq3sP4K6SJ4OVwQZ2JzuOPFCCWj/gPy4bxz5BuqHXM+YJ7KPrM8lLBa9qpOYzWVahNx6q AE01SNgmHqXh5pTxQ3X7p5srcPaV58DZUhBMI/oGRYEEABL4mJKAdrmS45F6qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670270964; 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=WidfpUrt23QrgDGt14Yt+WG+fCwTjrKILTrgUwPof2c=; b=SrIRncqCGUyKO3hFi7EQXKWvuS4aT9ENC8pTWzdcA76nRaCXQVMMucMffnrq0EVdB/AH7Y 6aB+l6N/mRlM6AK3mvFrugRVBVFtJ5LFKqPrGC3jEj38ljHgWYGcSMKuNsHOPWCdQ0BbhY rONCpicI6mTL3OOoxVXchj99pB2p0/xcmO6AgYujOO294uyGepzXbFWFh+oZVUH1Z6FK3s Ep+3C0JM5p0lgsa0UdB6zQ7/z3t1D8luurzJBFi7YSG3/orDPdCZF/vrJ69qxqmVErMl1Z OQ0N1rZWzGtCidFrQ5UweGIhfk870+4+RwD1t4ACyuP/MW+L79q6oQAd6UAK0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670270964; a=rsa-sha256; cv=none; b=alTTCEMPTbTC59BbMPZ3jRykTcJEgUlGh5SGLqdWKooKxagKy31SaZcHxht01EnKkV+Dw8 W2oyYqHXeO5yEiIjZgesWCWA2rFAOE1q7kJDe9+zfqxakBf+K5z5Ruyng+kwuESmomAPqO hfAr5z/PbjV2OIq/cwf3i1j6T6KQT6IXGt/mHXpaNgmgTblN9PlRrkVh7fgjjB9VdXKG3l 4CX6QQJWyyiEpTUEoIaIRWFpAPWSnHGA9H3vfpXDd5SxciLVR9csIEBvRext+u3faS8TzU OT1lCPslt0QQ27Ldqw/PPU5ns885afECMoeGk6jGRb7uzbfZlP12JwrRbsPoyg== 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 4NQvlR71h7z190x; Mon, 5 Dec 2022 20:09:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2B5K9Noe042608; Mon, 5 Dec 2022 20:09:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B5K9Nsl042607; Mon, 5 Dec 2022 20:09:23 GMT (envelope-from git) Date: Mon, 5 Dec 2022 20:09:23 GMT Message-Id: <202212052009.2B5K9Nsl042607@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: e63d23edd8c9 - 2022Q4 - security/libgcrypt: Circumvent WITH_DEBUG build failure List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q4 X-Git-Reftype: branch X-Git-Commit: e63d23edd8c9a7b25e5539fa7c72d2b00316aa04 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=e63d23edd8c9a7b25e5539fa7c72d2b00316aa04 commit e63d23edd8c9a7b25e5539fa7c72d2b00316aa04 Author: Cy Schubert AuthorDate: 2022-12-05 15:58:23 +0000 Commit: Cy Schubert CommitDate: 2022-12-05 20:06:34 +0000 security/libgcrypt: Circumvent WITH_DEBUG build failure Register allocation exaustion results within inline assembly when WITH_DEBUG is specified. Therefore when WITH_DEBUG is used, disable inline assembly. PR: 268173 Reported by: bofh (cherry picked from commit c35577ebc10af5ae8c509e4c73a44a06ac5b05d4) --- security/libgcrypt/Makefile | 4 ++++ security/libgcrypt/files/patch-tests_basic.c | 29 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile index 85dd47823d00..d6a3c5aef1b8 100644 --- a/security/libgcrypt/Makefile +++ b/security/libgcrypt/Makefile @@ -45,6 +45,10 @@ STATIC_CONFIGURE_ENABLE= static CONFIGURE_ARGS+= --disable-jent-support .endif +.if defined(WITH_DEBUG) +CFLAGS+= -DWITH_DEBUG +.endif + post-patch: @${RM} ${WRKSRC}/doc/gcrypt.info* @${REINPLACE_CMD} -e 's|ALIGN (3)|ALIGN (2)|g' ${WRKSRC}/mpi/i386/*.S diff --git a/security/libgcrypt/files/patch-tests_basic.c b/security/libgcrypt/files/patch-tests_basic.c new file mode 100644 index 000000000000..4735524ff689 --- /dev/null +++ b/security/libgcrypt/files/patch-tests_basic.c @@ -0,0 +1,29 @@ +--- tests/basic.c.orig 2021-08-22 04:56:06.000000000 -0700 ++++ tests/basic.c 2022-12-05 07:46:59.768944000 -0800 +@@ -38,6 +38,10 @@ + #else + # define ALWAYS_INLINE + #endif ++#ifdef WITH_DEBUG ++# undef ALWAYS_INLINE ++# define ALWAYS_INLINE ++#endif + + typedef struct test_spec_pubkey_key + { +@@ -214,6 +218,7 @@ + } + + ++#ifndef WITH_DEBUG + #if defined(__x86_64__) && defined(HAVE_GCC_INLINE_ASM_SSSE3) && \ + (defined(HAVE_COMPATIBLE_GCC_AMD64_PLATFORM_AS) || \ + defined(HAVE_COMPATIBLE_GCC_WIN64_PLATFORM_AS)) +@@ -233,6 +238,7 @@ + defined(__ARM_NEON) + # define CLUTTER_VECTOR_REGISTER_NEON 1 + # define CLUTTER_VECTOR_REGISTER_COUNT 16 ++#endif + #endif + +