gentoo resync : 14.07.2018

3 files changed, 0 insertions, 123 deletions

diff --git a/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch b/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch
deleted file mode 100644
index 1a7fa7913e42..000000000000
--- a/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit a5aa2c3cbae207d12b9f2fded36a47031c55be36
-Author: Andrew Savchenko <bircoph@gmail.com>
-Date:   Thu Nov 17 00:04:47 2016 +0300
-
-    Fix build with recent binutils
-    
-    Gentoo-Bug:         457980
-    Upstream Ticket:    5
-
-diff --git a/src/lookup.c b/src/lookup.c
-index ba54991..809981b 100644
---- a/src/lookup.c
-+++ b/src/lookup.c
-@@ -27,13 +27,13 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/utsname.h>
--#include <bfd.h>
- #include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- 
- #include "lookup.h"
-+#include <bfd.h>
- 
- extern struct lookup_methods bfd_methods;
- extern struct lookup_methods kallsym_methods;
-diff --git a/src/lookup.h b/src/lookup.h
-index e6568d8..47a7b56 100644
---- a/src/lookup.h
-+++ b/src/lookup.h
-@@ -28,6 +28,9 @@
- #include <stdlib.h>
- #include <asm/types.h>
- 
-+// satisfy PR 14072 in bfd.h
-+#define PACKAGE 1
-+#define PACKAGE_VERSION 1
- 
- /*
-  * Initalization routine
-diff --git a/src/lookup_bfd.c b/src/lookup_bfd.c
-index cc7010b..271d426 100644
---- a/src/lookup_bfd.c
-+++ b/src/lookup_bfd.c
-@@ -25,13 +25,13 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/utsname.h>
--#include <bfd.h>
- #include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- 
- #include "lookup.h"
-+#include <bfd.h>
- 
- 
- static int lookup_bfd_init(void)
-diff --git a/src/lookup_kas.c b/src/lookup_kas.c
-index 16e639f..556cb62 100644
---- a/src/lookup_kas.c
-+++ b/src/lookup_kas.c
-@@ -25,7 +25,6 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/utsname.h>
--#include <bfd.h>
- #include <string.h>
- #include <unistd.h>
- #include <sys/types.h>
-@@ -33,6 +32,7 @@
- #include <sys/queue.h>
- 
- #include "lookup.h"
-+#include <bfd.h>
- 
- struct symbol_entry {
- 	char *sym_name;
diff --git a/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch b/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch
deleted file mode 100644
index 14ffcc83513e..000000000000
--- a/dev-util/dropwatch/files/dropwatch-1.4-makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/Makefile.orig	2012-10-24 13:27:12.000000000 +0400
-+++ src/Makefile	2012-10-24 13:27:47.000000000 +0400
-@@ -1,14 +1,14 @@
- all: dropwatch
--CFLAGS+=-c -g -D_GNU_SOURCE -Wall -Werror `pkg-config --cflags libnl-3.0`
--LDFLAGS=-lbfd -lreadline -lnl-3 -lnl-genl-3
-+CFLAGS+=-c -D_GNU_SOURCE -Wall `pkg-config --cflags libnl-3.0`
-+LIBS=-lbfd -lreadline -lnl-3 -lnl-genl-3
- OBJFILES := main.o lookup.o\
- 	 lookup_bfd.o lookup_kas.o
- 
- dropwatch: $(OBJFILES) 
--	gcc -g -o dropwatch $(OBJFILES) $(LDFLAGS) 
-+	$(CC) -o dropwatch $(LDFLAGS) $(OBJFILES) $(LIBS)
- 
- %.o: %.c
--	gcc $(CFLAGS) $<
-+	$(CC) $(CFLAGS) $<
- clean:
- 	rm -f dropwatch *.o
- 
diff --git a/dev-util/dropwatch/files/dropwatch-1.4_p20150706-makefile.patch b/dev-util/dropwatch/files/dropwatch-1.4_p20150706-makefile.patch
deleted file mode 100644
index d2a9a6b761b6..000000000000
--- a/dev-util/dropwatch/files/dropwatch-1.4_p20150706-makefile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index 5bc6aaa..4eab2e8 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -1,14 +1,14 @@
- all: dropwatch
- 
- CPPFLAGS += -D_GNU_SOURCE
--CFLAGS += -g -Wall -Werror $(shell pkg-config --cflags libnl-3.0)
-+CFLAGS += -g -Wall $(shell pkg-config --cflags libnl-3.0)
- LDLIBS += -lbfd -lreadline -lnl-3 -lnl-genl-3
- 
- OBJFILES := main.o lookup.o\
- 	 lookup_bfd.o lookup_kas.o
- 
- dropwatch: $(OBJFILES) 
--	$(LINK.o) $^ $(LOADLIBES) $(LDLIBS) -o $@
-+	$(LINK.o) $(CFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
- 
- clean:
- 	$(RM) dropwatch *.o