From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1F1AF15800C for ; Mon, 3 Apr 2023 14:51:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39FF7E086D; Mon, 3 Apr 2023 14:51:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 20828E086D for ; Mon, 3 Apr 2023 14:51:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0817333BF41 for ; Mon, 3 Apr 2023 14:51:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43FD28EB for ; Mon, 3 Apr 2023 14:51:12 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1680533266.c4d457bd94c24853e0f6fe5ad3551f9407edde79.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libgcrypt/, dev-libs/libgcrypt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libgcrypt/files/libgcrypt-1.10-build-Allow-build-with-Oz.patch dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild X-VCS-Directories: dev-libs/libgcrypt/ dev-libs/libgcrypt/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: c4d457bd94c24853e0f6fe5ad3551f9407edde79 X-VCS-Branch: master Date: Mon, 3 Apr 2023 14:51:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 66e8c112-f768-4608-8179-55da34b8e9b2 X-Archives-Hash: 6bf95ce7380677046c172d529d836040 commit: c4d457bd94c24853e0f6fe5ad3551f9407edde79 Author: Mike Gilbert gentoo org> AuthorDate: Mon Apr 3 14:47:14 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Apr 3 14:47:46 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4d457bd dev-libs/libgcrypt: enable munging of -Oz Closes: https://bugs.gentoo.org/902765 Signed-off-by: Mike Gilbert gentoo.org> .../libgcrypt-1.10-build-Allow-build-with-Oz.patch | 50 ++++++++++++++++++++++ dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild | 1 + 2 files changed, 51 insertions(+) diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.10-build-Allow-build-with-Oz.patch b/dev-libs/libgcrypt/files/libgcrypt-1.10-build-Allow-build-with-Oz.patch new file mode 100644 index 000000000000..c54499e15dba --- /dev/null +++ b/dev-libs/libgcrypt/files/libgcrypt-1.10-build-Allow-build-with-Oz.patch @@ -0,0 +1,50 @@ +https://bugs.gentoo.org/902765 +https://dev.gnupg.org/T6432 +https://dev.gnupg.org/rC7edf1abb9a0d892a80cbf7ab42f64b2720671ee9 + +From 7edf1abb9a0d892a80cbf7ab42f64b2720671ee9 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Mon, 3 Apr 2023 14:00:15 +0900 +Subject: [PATCH] build: Allow build with -Oz. + +* cipher/Makefile.am [ENABLE_O_FLAG_MUNGING]: Support -Oz. +* random/Makefile.am [ENABLE_O_FLAG_MUNGING]: Support -Oz. + +-- + +GnuPG-bug-id: 6432 +Signed-off-by: NIIBE Yutaka +--- + cipher/Makefile.am | 2 +- + random/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cipher/Makefile.am b/cipher/Makefile.am +index cf1fbe85..e67b1ee2 100644 +--- a/cipher/Makefile.am ++++ b/cipher/Makefile.am +@@ -165,7 +165,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c + + + if ENABLE_O_FLAG_MUNGING +-o_flag_munging = sed -e 's/-O\([2-9sg][2-9sg]*\)/-O1/' -e 's/-Ofast/-O1/g' ++o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]*\)/-O1/' -e 's/-Ofast/-O1/g' + else + o_flag_munging = cat + endif +diff --git a/random/Makefile.am b/random/Makefile.am +index af978570..0c935a05 100644 +--- a/random/Makefile.am ++++ b/random/Makefile.am +@@ -56,7 +56,7 @@ jitterentropy-base.c jitterentropy.h jitterentropy-base-user.h + + # The rndjent module needs to be compiled without optimization. */ + if ENABLE_O_FLAG_MUNGING +-o_flag_munging = sed -e 's/-O\([1-9sg][1-9sg]*\)/-O0/g' -e 's/-Ofast/-O0/g' ++o_flag_munging = sed -e 's/-O\([1-9sgz][1-9sgz]*\)/-O0/g' -e 's/-Ofast/-O0/g' + else + o_flag_munging = cat + endif +-- +2.40.0 + diff --git a/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild index 2d2497903a5b..d21cd0309fdb 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.10.1-r3.ebuild @@ -47,6 +47,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.10.1-fix-no-asm-hppa.patch "${FILESDIR}"/${PN}-1.9.4-no-fgrep-libgcrypt-config.patch "${FILESDIR}"/${PN}-1.10.1-configure-clang16.patch + "${FILESDIR}"/libgcrypt-1.10-build-Allow-build-with-Oz.patch ) MULTILIB_CHOST_TOOLS=(