* [gentoo-commits] repo/gentoo:master commit in: sys-apps/moreutils/files/, sys-apps/moreutils/
@ 2020-05-09 13:48 Thomas Deutschmann
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Deutschmann @ 2020-05-09 13:48 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/moreutils/files/, sys-apps/moreutils/
@ 2020-06-10 1:26 Thomas Deutschmann
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Deutschmann @ 2020-06-10 1:26 UTC (permalink / raw
To: gentoo-commits
commit: b342296b4e4e4e4663f3ec4507f25bcdfcceedb8
Author: Sam James (sam_c) <sam <AT> cmpct <DOT> info>
AuthorDate: Mon Jun 8 07:53:11 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> 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) <sam <AT> cmpct.info>
Closes: https://github.com/gentoo/gentoo/pull/16127
Signed-off-by: Thomas Deutschmann <whissi <AT> 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 <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
+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() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/moreutils/files/, sys-apps/moreutils/
@ 2020-12-20 6:29 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2020-12-20 6:29 UTC (permalink / raw
To: gentoo-commits
commit: 970e7ce14a0d9d4433000bed5d6b15c63c3db498
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 06:28:29 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 06:28:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=970e7ce1
sys-apps/moreutils: cleanup old
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/moreutils/Manifest | 1 -
.../files/moreutils-0.63-respect-env.patch | 23 --------
sys-apps/moreutils/moreutils-0.63.ebuild | 67 ----------------------
3 files changed, 91 deletions(-)
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 4f29a06c52c..db4daa91ebc 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,2 +1 @@
DIST moreutils-0.64.tar.gz 92741 BLAKE2B 3e014a18a3b7615bcd83fd9b0a1e3010a059aae154395c2c1158f57634fe83c27503dc3aff1e116743cf80fc73ee2063ea60b03d4bece4119b962669095c71dc SHA512 94f131b9b02a8c1139dfe34abacab022687f51413c529288f57fa876676c028e200324ed855b910a7dbfb4290eb8b38b3dc182eda49988f521a550162b0a0eec
-DIST moreutils_0.63.orig.tar.xz 80468 BLAKE2B 39efa522c5bf9b982b70c1180f622a7d5a489cabbeb741f2a1a0674dfe9907ef85bccccf9f9cc4ae8d3c81442b1513f0692c070b4c00f052135528dc0e47eb6f SHA512 71bd5ec4d265dff708db372189146acb067c4edaf62888755d245ccb3f4b5bb54f6c31bda68991f78c27ab231de8ea7126f947834f3604b60d7142d0357cb66b
diff --git a/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch b/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch
deleted file mode 100644
index 45f85b1988e..00000000000
--- a/sys-apps/moreutils/files/moreutils-0.63-respect-env.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/is_utf8/Makefile b/is_utf8/Makefile
-index 4ebf8be..f0a111e 100644
---- a/is_utf8/Makefile
-+++ b/is_utf8/Makefile
-@@ -37,14 +37,14 @@ LINKERNAME = lib$(NAME).so
- SONAME = $(LINKERNAME).$(VERSION)
- REALNAME = $(SONAME).$(MINOR).$(RELEASE)
-
--CC = gcc
--CFLAGS = -O3 -Wextra -Wall -ansi -Wstrict-prototypes
-+CC ?= gcc
-+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)
diff --git a/sys-apps/moreutils/moreutils-0.63.ebuild b/sys-apps/moreutils/moreutils-0.63.ebuild
deleted file mode 100644
index 616df9ea930..00000000000
--- a/sys-apps/moreutils/moreutils-0.63.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="a collection of tools that nobody thought to write when Unix was young"
-HOMEPAGE="https://joeyh.name/code/moreutils/"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ppc ~ppc64 x86 ~x86-linux"
-IUSE="+doc +perl"
-
-RDEPEND="
- perl? (
- dev-lang/perl
- dev-perl/IPC-Run
- dev-perl/Time-Duration
- dev-perl/TimeDate
- )"
-DEPEND="
- app-admin/eselect
- doc? (
- dev-lang/perl
- >=app-text/docbook2X-0.8.8-r2
- app-text/docbook-xml-dtd:4.4
- )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.63-respect-env.patch
-)
-
-src_prepare() {
- # don't build manpages
- if ! use doc ; then
- sed -i -e '/^all:/s/$(MANS)//' -e '/man1/d' Makefile || die
- fi
-
- # don't install perl scripts
- if ! use perl ; then
- sed -i -e '/PERLSCRIPTS/d' Makefile || die
- fi
-
- default
-}
-
-src_compile() {
- tc-export CC
- emake CFLAGS="${CFLAGS}" DOCBOOKXSL=/usr/share/sgml/docbook/xsl-stylesheets PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
-
- # sys-process is more advanced than parallel from moreutils, rename it
- if use doc; then
- mv "${ED}"/usr/share/man/man1/{,${PN}_}parallel.1 || die
- fi
- mv "${ED}"/usr/bin/{,${PN}_}parallel || die
-}
-
-pkg_postinst() {
- # try to make sure $EDITOR is valid for vipe (bug #604630)
- eselect editor update
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-20 6:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-09 13:48 [gentoo-commits] repo/gentoo:master commit in: sys-apps/moreutils/files/, sys-apps/moreutils/ Thomas Deutschmann
-- strict thread matches above, loose matches on Subject: below --
2020-06-10 1:26 Thomas Deutschmann
2020-12-20 6:29 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox