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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1C5D31382C5 for ; Wed, 10 Jun 2020 01:26:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22962E0891; Wed, 10 Jun 2020 01:26:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5B34E0891 for ; Wed, 10 Jun 2020 01:26:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1C1F34E66B for ; Wed, 10 Jun 2020 01:26:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F331263 for ; Wed, 10 Jun 2020 01:26:28 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1591752337.b342296b4e4e4e4663f3ec4507f25bcdfcceedb8.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/moreutils/files/, sys-apps/moreutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/moreutils/files/moreutils-0.63-respect-env.patch sys-apps/moreutils/moreutils-0.63.ebuild X-VCS-Directories: sys-apps/moreutils/ sys-apps/moreutils/files/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: b342296b4e4e4e4663f3ec4507f25bcdfcceedb8 X-VCS-Branch: master Date: Wed, 10 Jun 2020 01:26:28 +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: 28b5e377-50a1-4cb0-b1b3-ed3bc9c48759 X-Archives-Hash: 486168fa0c1e4ba662f2e1b7a7541c76 commit: b342296b4e4e4e4663f3ec4507f25bcdfcceedb8 Author: Sam James (sam_c) cmpct info> AuthorDate: Mon Jun 8 07:53:11 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Jun 10 01:25:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b342296b sys-apps/moreutils: Respect CC In 47abea9b0, we took the upstream patch, without noticing that the original (non-upstream) one fixed respecting CC too, while upstream's did not. This fixes the patch accordingly. Closes: https://bugs.gentoo.org/727480 Bug: https://bugs.gentoo.org/721394 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sam James (sam_c) cmpct.info> Closes: https://github.com/gentoo/gentoo/pull/16127 Signed-off-by: Thomas Deutschmann gentoo.org> .../files/moreutils-0.63-respect-env.patch | 25 +++++----------------- sys-apps/moreutils/moreutils-0.63.ebuild | 2 +- 2 files changed, 6 insertions(+), 21 deletions(-) diff --git a/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch b/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch index a4091cf599d..45f85b1988e 100644 --- a/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch +++ b/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch @@ -1,26 +1,14 @@ -From 6c88aaa6b828d7bd7c1dccb3b842594d48c1764c Mon Sep 17 00:00:00 2001 -From: Nicolas Schier -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 ---- - 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 +index 4ebf8be..f0a111e 100644 --- a/is_utf8/Makefile +++ b/is_utf8/Makefile -@@ -38,13 +38,13 @@ SONAME = $(LINKERNAME).$(VERSION) +@@ -37,14 +37,14 @@ LINKERNAME = lib$(NAME).so + SONAME = $(LINKERNAME).$(VERSION) REALNAME = $(SONAME).$(MINOR).$(RELEASE) - CC = gcc +-CC = gcc -CFLAGS = -O3 -Wextra -Wall -ansi -Wstrict-prototypes ++CC ?= gcc +CFLAGS ?= -O3 -Wextra -Wall -ansi -Wstrict-prototypes $(NAME): $(OBJ) @@ -33,6 +21,3 @@ index 4ebf8be..13b1021 100644 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 1f7d01766c7..616df9ea930 100644 --- a/sys-apps/moreutils/moreutils-0.63.ebuild +++ b/sys-apps/moreutils/moreutils-0.63.ebuild @@ -29,7 +29,7 @@ DEPEND=" )" PATCHES=( - "${FILESDIR}"/${P}-respect-env.patch + "${FILESDIR}"/${PN}-0.63-respect-env.patch ) src_prepare() {