gentoo resync : 24.12.2018

3 files changed, 42 insertions, 0 deletions

diff --git a/dev-libs/capstone/files/capstone-4.0-FLAGS.patch b/dev-libs/capstone/files/capstone-4.0-FLAGS.patch
new file mode 100644
index 000000000000..66e855c0c34d
--- /dev/null
+++ b/dev-libs/capstone/files/capstone-4.0-FLAGS.patch
@@ -0,0 +1,20 @@
+Drop -O3 and allow user to specify their optimizations.
+
+--- a/cstool/Makefile
++++ b/cstool/Makefile
+@@ -1,13 +1,14 @@
+ # Makefile for Cstool of Capstone Disassembly Engine
+ 
+ include ../functions.mk
++include ../config.mk
+ 
+ .PHONY: clean all
+ 
+ LIBNAME = capstone
+ 
+ CFLAGS += -I../include -I.
+-LDFLAGS += -O3 -Wall -L.. -l$(LIBNAME)
++LDFLAGS += -Wall -L.. -l$(LIBNAME)
+ 
+ TARGET = cstool
+ SOURCES := $(wildcard *.c)
diff --git a/dev-libs/capstone/files/capstone-4.0-double-DESTDIR.patch b/dev-libs/capstone/files/capstone-4.0-double-DESTDIR.patch
new file mode 100644
index 000000000000..46aca725e40c
--- /dev/null
+++ b/dev-libs/capstone/files/capstone-4.0-double-DESTDIR.patch
@@ -0,0 +1,12 @@
+https://github.com/aquynh/capstone/issues/1311
+
+Avoid double DESTDIR in install.
+--- a/Makefile
++++ b/Makefile
+@@ -75,4 +75,4 @@ LIBDIRARCH ?= lib
+ #LIBDIRARCH ?= lib64
+-LIBDIR = $(DESTDIR)$(PREFIX)/$(LIBDIRARCH)
+-BINDIR = $(DESTDIR)$(PREFIX)/bin
++LIBDIR = $(PREFIX)/$(LIBDIRARCH)
++BINDIR = $(PREFIX)/bin
+ 
diff --git a/dev-libs/capstone/files/capstone-4.0-no-fuzz-tests.patch b/dev-libs/capstone/files/capstone-4.0-no-fuzz-tests.patch
new file mode 100644
index 000000000000..ae412e9b233c
--- /dev/null
+++ b/dev-libs/capstone/files/capstone-4.0-no-fuzz-tests.patch
@@ -0,0 +1,10 @@
+https://github.com/aquynh/capstone/issues/1310
+
+fuzz tests are missing
+--- a/Makefile
++++ b/Makefile
+@@ -463,3 +463,3 @@ TESTS += test_systemz.static test_x86.static test_xcore.static test_m680x.static
+ TESTS += test_skipdata test_skipdata.static test_iter.static test_evm.static
+-check: $(TESTS) fuzztest fuzzallcorp
++check: $(TESTS) fuzztest # fuzzallcorp
+ test_%: