From: "Thomas Deutschmann" <whissi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/moreutils/files/, sys-apps/moreutils/
Date: Sat, 9 May 2020 13:48:44 +0000 (UTC) [thread overview]
Message-ID: <1589032102.47abea9b09a67cdb87fb316c5bbb131987d6b247.whissi@gentoo> (raw)
commit: 47abea9b09a67cdb87fb316c5bbb131987d6b247
Author: Sam James (sam_c) <sam <AT> cmpct <DOT> info>
AuthorDate: Fri May 8 03:01:45 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat May 9 13:48:22 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47abea9b
sys-apps/moreutils: Respect compiler environment
Now respects CC as well as CFLAGS.
This patch is taken from upstream, not yet in
a release.
Thanks-to: Agostino Sarubbo <ago <AT> gentoo.org>
Closes: https://bugs.gentoo.org/721394
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sam James (sam_c) <sam <AT> cmpct.info>
Closes: https://github.com/gentoo/gentoo/pull/15703
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
.../files/moreutils-0.63-respect-env.patch | 38 ++++++++++++++++++++++
sys-apps/moreutils/moreutils-0.63.ebuild | 6 +++-
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch b/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch
new file mode 100644
index 00000000000..a4091cf599d
--- /dev/null
+++ b/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch
@@ -0,0 +1,38 @@
+From 6c88aaa6b828d7bd7c1dccb3b842594d48c1764c Mon Sep 17 00:00:00 2001
+From: Nicolas Schier <nicolas@fjasle.eu>
+Date: Wed, 27 Nov 2019 21:16:12 +0100
+Subject: is_utf8: allow propagation of compiler and linker flags
+
+Allow propagating compiler and linker flags via overrides of CFLAGS and
+LDFLAGS variables. This allows enabling of hardening flags w/o
+modification of the original Makefile.
+
+Signed-off-by: Nicolas Schier <nicolas@fjasle.eu>
+---
+ is_utf8/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/is_utf8/Makefile b/is_utf8/Makefile
+index 4ebf8be..13b1021 100644
+--- a/is_utf8/Makefile
++++ b/is_utf8/Makefile
+@@ -38,13 +38,13 @@ SONAME = $(LINKERNAME).$(VERSION)
+ REALNAME = $(SONAME).$(MINOR).$(RELEASE)
+
+ CC = gcc
+-CFLAGS = -O3 -Wextra -Wall -ansi -Wstrict-prototypes
++CFLAGS ?= -O3 -Wextra -Wall -ansi -Wstrict-prototypes
+
+ $(NAME): $(OBJ)
+- $(CC) $(CFLAGS) -o $(NAME) $(OBJ)
++ $(CC) $(CFLAGS) -o $(NAME) $(OBJ) $(LDFLAGS)
+
+ IS_UTF8_LIB:
+- $(CC) --shared -fPIC $(CFLAGS) $(LIB_SRC) -o $(LINKERNAME)
++ $(CC) --shared -fPIC $(CFLAGS) $(LDFLAGS) $(LIB_SRC) -o $(LINKERNAME)
+
+ all:
+ @make $(NAME)
+--
+cgit v1.2.3
+
diff --git a/sys-apps/moreutils/moreutils-0.63.ebuild b/sys-apps/moreutils/moreutils-0.63.ebuild
index cda09be7454..3717d9f1f27 100644
--- a/sys-apps/moreutils/moreutils-0.63.ebuild
+++ b/sys-apps/moreutils/moreutils-0.63.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -28,6 +28,10 @@ DEPEND="
app-text/docbook-xml-dtd:4.4
)"
+PATCHES=(
+ "${FILESDIR}"/${P}-respect-env.patch
+)
+
src_prepare() {
# don't build manpages
if ! use doc ; then
next reply other threads:[~2020-05-09 13:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-09 13:48 Thomas Deutschmann [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-06-10 1:26 [gentoo-commits] repo/gentoo:master commit in: sys-apps/moreutils/files/, sys-apps/moreutils/ Thomas Deutschmann
2020-12-20 6:29 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1589032102.47abea9b09a67cdb87fb316c5bbb131987d6b247.whissi@gentoo \
--to=whissi@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox