From nobody Mon Dec 5 19:53:09 2022 X-Original-To: dev-commits-ports-all@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 4NQvNk0QV4z4jM61; Mon, 5 Dec 2022 19:53:10 +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 4NQvNj6nthz3hRF; Mon, 5 Dec 2022 19:53:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670269990; 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=jZxd0i1g35fC6R8J/G6sS3IqDVrfeAOyxEGw+z4mj8s=; b=t3zNJR0Sqcue2eQ/bHMfiZpH2us4kaIGP/JhNm0eZJ3ALsA6rUGIl3ebhY1QRuMLfcFhQx jR3haSDwahmVEL9LFppljRly6hrhkDPeMNbtmz4V3hbqcC7blytQ5u6CDk8wN0HGtEGkhY tgf2/VLNch6fk2eFDzrLr6mN1wgg1ih4fn6tNHTbFkpYciPhwRdZFIXZYNco30a3kyfFPK LyqRHDAk5MBKNwi+ueo0ltDRIr6HpBtpQBU/8qxXQ2SjSB+/l3udg86ZTXiambQRjZuf7/ Ub5Yhp7SjTXpBC/0otRJURKRWXgAPfdQM9m48W2IpdPIVOBSPkdDL46MvUuAWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670269990; 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=jZxd0i1g35fC6R8J/G6sS3IqDVrfeAOyxEGw+z4mj8s=; b=jQzpk3htaoLWfm6nfwI232rh5lBn8xRzma3/U5/H6QZqWYgb9f+B4N1tqbGwR/4Lx2dr70 C+ct4yLrZN8JqJL7H2EsBDZRKn7H8O7MAfRTM3PcoIVkxM5YrkYknom/Pmey3J+eud5TB3 UnHivbFzgQPOQ06+CeI54fICQdkAJUg0xJTx8KQnaQL+gnZEZNcbLMTohf3ciawxijunyL kVdvvRT2GlxnRyWYPFnMq7i+HfQDqbTR6zLvzfYHlAHkOYVVyNeX0AkEGg5haKY1W+R9k5 geO0recWIdZMXVuD0lbVYxu/9ak9/kuxg3kaZ+Ku9sgOAtmuu/zDViRVVqxErA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670269990; a=rsa-sha256; cv=none; b=rVeQPXZKFMdeMvtA6I/xkiPQyfr1DZCHcUqDe668QI+uX4wyE6XtubssIjG0MW1ugv2rRU fAHp6GvN109TAuDQ0BZ8DdK+4BpUATddk+hsLap89C8J8hBEDWZiTbGTNWQvwpdpUN6Lv2 NE+TZJYYYLjfkbWptuQCuOAcaICp6iXVjBHTR5PbFSaSxjWQjLf3rnRigx3sOavCOpoBP4 PYQEx6So9NX8Ihx4CYYxQUIulgjUUoOR7JKkIvlGAb9VIaEkx6Q5a1RXNKrS5ywh/7iYkg 4G0UEVmr+k4MHilBJOAqCP/57zoSLMBdCWtFJqoOp6mobUKIUImZwakBxpcU1A== 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 4NQvNj5r0lz18ll; Mon, 5 Dec 2022 19:53:09 +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 2B5Jr9hL025937; Mon, 5 Dec 2022 19:53:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B5Jr9Sn025936; Mon, 5 Dec 2022 19:53:09 GMT (envelope-from git) Date: Mon, 5 Dec 2022 19:53:09 GMT Message-Id: <202212051953.2B5Jr9Sn025936@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: c35577ebc10a - main - security/libgcrypt: Circumvent WITH_DEBUG build failure List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: c35577ebc10af5ae8c509e4c73a44a06ac5b05d4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c35577ebc10af5ae8c509e4c73a44a06ac5b05d4 commit c35577ebc10af5ae8c509e4c73a44a06ac5b05d4 Author: Cy Schubert AuthorDate: 2022-12-05 15:58:23 +0000 Commit: Cy Schubert CommitDate: 2022-12-05 19:52:37 +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 MFH: 2022Q4 --- 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 + +