From 8b4ace9c50842c5b83401ea7b179dcab940387e1 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 23 Sep 2020 10:22:15 +0100 Subject: gentoo resync : 23.09.2020 --- .../files/pps-tools-0.0.20120407-build.patch | 53 ---------------------- .../files/pps-tools-0.0.20120407-install.patch | 28 ------------ .../files/pps-tools-1.0.1-LDFLAGS-fix.patch | 25 ---------- .../pps-tools/files/pps-tools-1.0.1-build.patch | 51 --------------------- 4 files changed, 157 deletions(-) delete mode 100644 net-misc/pps-tools/files/pps-tools-0.0.20120407-build.patch delete mode 100644 net-misc/pps-tools/files/pps-tools-0.0.20120407-install.patch delete mode 100644 net-misc/pps-tools/files/pps-tools-1.0.1-LDFLAGS-fix.patch delete mode 100644 net-misc/pps-tools/files/pps-tools-1.0.1-build.patch (limited to 'net-misc/pps-tools/files') diff --git a/net-misc/pps-tools/files/pps-tools-0.0.20120407-build.patch b/net-misc/pps-tools/files/pps-tools-0.0.20120407-build.patch deleted file mode 100644 index 5a27bb65184b..000000000000 --- a/net-misc/pps-tools/files/pps-tools-0.0.20120407-build.patch +++ /dev/null @@ -1,53 +0,0 @@ -From f4133df52856adfe9ffa2152f0e449f2f8adb49d Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 18 Aug 2012 17:04:43 -0400 -Subject: [PATCH] fix up makefile - -Make sure we respect CFLAGS/CPPFLAGS properly. - -Also fix up the depend include so we get reproducible behavior -- -the depend file is generated & included first, and we don't get -weird behavior when we run: - git clean -x -d - make - make - -Signed-off-by: Mike Frysinger ---- - Makefile | 13 +++++-------- - 1 file changed, 5 insertions(+), 8 deletions(-) - -diff --git a/Makefile b/Makefile -index 0fb84b4..a07156f 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,9 +1,8 @@ - TARGETS = ppstest ppsctl ppswatch - --CFLAGS += -Wall -O2 -D_GNU_SOURCE --CFLAGS += -I . --CFLAGS += -ggdb --CFLAGS += -D__N_PPS=18 -+CFLAGS ?= -O2 -ggdb -+CFLAGS += -Wall -+CPPFLAGS += -D_GNU_SOURCE -I. -D__N_PPS=18 - - # -- Actions section -- - -@@ -12,11 +11,9 @@ CFLAGS += -D__N_PPS=18 - all : .depend $(TARGETS) - - .depend depend dep : -- $(CC) $(CFLAGS) -M $(TARGETS:=.c) > .depend -+ $(CC) $(CPPFLAGS) $(CFLAGS) -M $(TARGETS:=.c) > .depend - --ifeq (.depend,$(wildcard .depend)) --include .depend --endif -+-include .depend - - install : all - install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS) --- -1.7.9.7 - diff --git a/net-misc/pps-tools/files/pps-tools-0.0.20120407-install.patch b/net-misc/pps-tools/files/pps-tools-0.0.20120407-install.patch deleted file mode 100644 index e268d6622a94..000000000000 --- a/net-misc/pps-tools/files/pps-tools-0.0.20120407-install.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0b3a849153ffb42fb22fe42dc2b9e59ca23cec8c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 18 Aug 2012 17:15:19 -0400 -Subject: [PATCH] fix DESTDIR installs - -Make sure the dirs we install into exist first: - make install DESTDIR=$PWD/foo - -Signed-off-by: Mike Frysinger ---- - Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile b/Makefile -index a07156f..bebcce7 100644 ---- a/Makefile -+++ b/Makefile -@@ -16,6 +16,7 @@ all : .depend $(TARGETS) - -include .depend - - install : all -+ mkdir -p -m 755 $(DESTDIR)/usr/bin $(DESTDIR)/usr/include/sys - install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS) - install -m 644 -t $(DESTDIR)/usr/include/sys timepps.h - --- -1.7.9.7 - diff --git a/net-misc/pps-tools/files/pps-tools-1.0.1-LDFLAGS-fix.patch b/net-misc/pps-tools/files/pps-tools-1.0.1-LDFLAGS-fix.patch deleted file mode 100644 index 868d97138184..000000000000 --- a/net-misc/pps-tools/files/pps-tools-1.0.1-LDFLAGS-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 231123e1b275f88000e336a2d80d3d96c470ac5e Mon Sep 17 00:00:00 2001 -From: Thomas Deutschmann -Date: Fri, 13 Oct 2017 15:10:08 +0200 -Subject: [PATCH] We need LDLIBS instead of LDFLAGS - ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 039795e..a6bff4b 100644 ---- a/Makefile -+++ b/Makefile -@@ -4,7 +4,7 @@ CFLAGS ?= -O2 -ggdb - CFLAGS += -Wall - CFLAGS += -fPIC - CPPFLAGS += -D_GNU_SOURCE --LDFLAGS += -lm -+LDLIBS += -lm - - # -- Actions section -- - --- -2.14.2 - diff --git a/net-misc/pps-tools/files/pps-tools-1.0.1-build.patch b/net-misc/pps-tools/files/pps-tools-1.0.1-build.patch deleted file mode 100644 index adc127205afc..000000000000 --- a/net-misc/pps-tools/files/pps-tools-1.0.1-build.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 60a8a9d3195829cc0c2953fd02bdf0a155e0c158 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 18 Aug 2012 17:04:43 -0400 -Subject: [PATCH] fix up makefile - -Make sure we respect CFLAGS/CPPFLAGS properly. - -Also fix up the depend include so we get reproducible behavior -- -the depend file is generated & included first, and we don't get -weird behavior when we run: - git clean -x -d - make - make - ---- - Makefile | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/Makefile b/Makefile -index c70f073..ec437e2 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,8 +1,9 @@ - TARGETS = ppstest ppsctl ppswatch ppsldisc - --CFLAGS += -Wall -O2 -D_GNU_SOURCE --CFLAGS += -ggdb -+CFLAGS ?= -O2 -ggdb -+CFLAGS += -Wall - CFLAGS += -fPIC -+CPPFLAGS += -D_GNU_SOURCE - LDFLAGS += -lm - - # -- Actions section -- -@@ -12,11 +13,9 @@ LDFLAGS += -lm - all : .depend $(TARGETS) - - .depend depend dep : -- $(CC) $(CFLAGS) -M $(TARGETS:=.c) > .depend -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -M $(TARGETS:=.c) > .depend - --ifeq (.depend,$(wildcard .depend)) --include .depend --endif -+-include .depend - - install : all - install -m 755 -t $(DESTDIR)/usr/bin ppsfind $(TARGETS) --- -2.14.2 - -- cgit v1.2.3