gentoo resync : 04.01.2018

2 files changed, 30 insertions, 15 deletions

diff --git a/net-misc/openr2/files/1.3.0-respect-user-cflags.patch b/net-misc/openr2/files/1.3.0-respect-user-cflags.patch
deleted file mode 100644
index 7a8f23f3f29c..000000000000
--- a/net-misc/openr2/files/1.3.0-respect-user-cflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -uNr openr2-1.3.0.ORIG//configure.in openr2-1.3.0/configure.in
---- openr2-1.3.0.ORIG//configure.in	2010-05-13 11:59:14.000000000 +0100
-+++ openr2-1.3.0/configure.in	2010-05-13 11:59:35.000000000 +0100
-@@ -25,11 +25,6 @@
- AC_CONFIG_HEADERS(config.h)
- AM_INIT_AUTOMAKE
- 
--# let's default to compile with debugging information
--# most users will not even care about it
--CFLAGS='-ggdb3 -O0'
--CXXFLAGS='-ggdb3 -O0'
--
- AC_PROG_CC
- AC_PROG_LIBTOOL
- AC_LANG([C])
diff --git a/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch b/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch
new file mode 100644
index 000000000000..59918934d563
--- /dev/null
+++ b/net-misc/openr2/files/openr2-1.3.0-fix-build-system.patch
@@ -0,0 +1,30 @@
+--- a/configure.in
++++ b/configure.in
+@@ -25,11 +25,6 @@
+ AC_CONFIG_HEADERS(config.h)
+ AM_INIT_AUTOMAKE
+ 
+-# let's default to compile with debugging information
+-# most users will not even care about it
+-CFLAGS='-ggdb3 -O0'
+-CXXFLAGS='-ggdb3 -O0'
+-
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ AC_LANG([C])
+diff -ur ORIG/src/Makefile.am MOD/src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,10 +1,10 @@
+-AM_CFLAGS = -std=c99 -pedantic -Wall -Werror -Wwrite-strings -Wunused-variable -Wstrict-prototypes -Wmissing-prototypes 
++AM_CFLAGS = -std=c99 -pedantic -Werror -Wwrite-strings -Wunused-variable -Wstrict-prototypes -Wmissing-prototypes
+ if WANT_OR2_TRACE_STACKS
+ AM_CFLAGS += -DOR2_TRACE_STACKS
+ endif
+ 
+ if HAVE_SVNVERSION
+-AM_CFLAGS += -DREVISION=\"$(shell svnversion -n .)\"
++AM_CFLAGS += -DREVISION=\"0\"
+ endif
+ 
+ lib_LTLIBRARIES = libopenr2.la