diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2024-06-24 19:58:39 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2024-06-24 19:58:39 -0400 |
| commit | c524911b29b32e916c95608ee62da38c92380231 (patch) | |
| tree | 4dbe68ba509840408b3417054c4713454439f27c /dev-libs/libgcrypt | |
| parent | app-crypt/easy-rsa: Keyword 3.2.0 riscv, #934780 (diff) | |
| download | gentoo-c524911b29b32e916c95608ee62da38c92380231.tar.gz gentoo-c524911b29b32e916c95608ee62da38c92380231.tar.bz2 gentoo-c524911b29b32e916c95608ee62da38c92380231.zip | |
dev-libs/libgcrypt: fix o-flag-munging
Closes: https://bugs.gentoo.org/934801
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'dev-libs/libgcrypt')
| -rw-r--r-- | dev-libs/libgcrypt/files/libgcrypt-1.11.0-o-flag-munging.patch | 53 | ||||
| -rw-r--r-- | dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild | 1 |
2 files changed, 54 insertions, 0 deletions
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.11.0-o-flag-munging.patch b/dev-libs/libgcrypt/files/libgcrypt-1.11.0-o-flag-munging.patch new file mode 100644 index 000000000000..161e4ad5c132 --- /dev/null +++ b/dev-libs/libgcrypt/files/libgcrypt-1.11.0-o-flag-munging.patch @@ -0,0 +1,53 @@ +https://bugs.gentoo.org/934801 +https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=patch;h=e96df0c + +From e96df0c82e086bf348753d2d0fa37fa6191b4b14 Mon Sep 17 00:00:00 2001 +From: "simit.ghane" <simit.ghane@lge.com> +Date: Tue, 11 Jun 2024 07:22:28 +0530 +Subject: [PATCH] random:cipher: handle substitution in sed command + +* cipher/Makefile.am (o_flag_munging): Add 'g' flag for first sed +expression. +* random/Makefile.am (o_flag_munging): Likewise. +-- + +It was there earlier and accidentally removed from +Makefile.am of cipher and random + +Signed-off-by: simit.ghane <simit.ghane@lge.com> +[jk: add changelog to commit message] +Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> +--- + 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 ea9014cc..149c9f21 100644 +--- a/cipher/Makefile.am ++++ b/cipher/Makefile.am +@@ -169,7 +169,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c + + + if ENABLE_O_FLAG_MUNGING +-o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g' ++o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g' + else + o_flag_munging = cat + endif +diff --git a/random/Makefile.am b/random/Makefile.am +index c7100ef8..a42e4306 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/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /' -e 's/[[:blank:]]-Ofast/ -O0 /g' ++o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e 's/[[:blank:]]-Ofast/ -O0 /g' + else + o_flag_munging = cat + endif +-- +2.30.2 + diff --git a/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild b/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild index 10b42d5ca451..9e28b00286b3 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.11.0.ebuild @@ -52,6 +52,7 @@ PATCHES=( "${FILESDIR}"/${PN}-multilib-syspath.patch "${FILESDIR}"/${PN}-powerpc-darwin.patch "${FILESDIR}"/${P}-s390x.patch + "${FILESDIR}"/${P}-o-flag-munging.patch ) MULTILIB_CHOST_TOOLS=( |