From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 23 Sep 2020 10:22:15 +0100
Subject: gentoo resync : 23.09.2020

---
 .../files/quotatool-1.4.13-fix-buildsystem.patch   | 31 ++++++++++++++++++++++
 .../quotatool/files/quotatool-1.4.13-ldflags.patch | 23 ----------------
 2 files changed, 31 insertions(+), 23 deletions(-)
 create mode 100644 sys-fs/quotatool/files/quotatool-1.4.13-fix-buildsystem.patch
 delete mode 100644 sys-fs/quotatool/files/quotatool-1.4.13-ldflags.patch

(limited to 'sys-fs/quotatool/files')

diff --git a/sys-fs/quotatool/files/quotatool-1.4.13-fix-buildsystem.patch b/sys-fs/quotatool/files/quotatool-1.4.13-fix-buildsystem.patch
new file mode 100644
index 000000000000..b65542988080
--- /dev/null
+++ b/sys-fs/quotatool/files/quotatool-1.4.13-fix-buildsystem.patch
@@ -0,0 +1,31 @@
+--- a/local.mk.in
++++ b/local.mk.in
+@@ -17,7 +17,8 @@
+ 
+ CC              :=   @CC@
+ CFLAGS          :=   @CFLAGS@
+-CPPFLAGS         =   $(inc) @DEFS@
++LDFLAGS         :=   @LDFLAGS@
++CPPFLAGS         =   @CPPFLAGS@ $(inc) @DEFS@
+ 
+ 
+ INSTALL         :=   @INSTALL@
+--- a/Makefile
++++ b/Makefile
+@@ -58,7 +58,7 @@
+ # compile the program (and the objects)
+ all: $(prog)
+ $(prog): $(objs)
+-	$(CC) -o $(prog) $(objs) $(libs) $(CFLAGS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $(prog) $(objs) $(libs)
+ 
+ 
+ 
+--- a/tools/depend.sh
++++ b/tools/depend.sh
+@@ -4,4 +4,4 @@
+ # Generated automatically from depend.sh.in by configure.
+ 
+ set -e
+-gcc -MM $* | sed 's#\($*\)\.o[ :]*#\1.o $@ : #g'
++${CC:-cc} -MM $* | sed 's#\($*\)\.o[ :]*#\1.o $@ : #g'
diff --git a/sys-fs/quotatool/files/quotatool-1.4.13-ldflags.patch b/sys-fs/quotatool/files/quotatool-1.4.13-ldflags.patch
deleted file mode 100644
index d73f02f8ce81..000000000000
--- a/sys-fs/quotatool/files/quotatool-1.4.13-ldflags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- quotatool-1.4.13/local.mk.in
-+++ quotatool-1.4.13/local.mk.in
-@@ -17,7 +17,8 @@
- 
- CC              :=   @CC@
- CFLAGS          :=   @CFLAGS@
--CPPFLAGS         =   $(inc) @DEFS@
-+LDFLAGS         :=   @LDFLAGS@
-+CPPFLAGS         =   @CPPFLAGS@ $(inc) @DEFS@
- 
- 
- INSTALL         :=   @INSTALL@
---- quotatool-1.4.13/Makefile
-+++ quotatool-1.4.13/Makefile
-@@ -58,7 +58,7 @@
- # compile the program (and the objects)
- all: $(prog)
- $(prog): $(objs)
--	$(CC) -o $(prog) $(objs) $(libs) $(CFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(prog) $(objs) $(libs)
- 
- 
- 
-- 
cgit v1.2.3