From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sun, 25 Jun 2017 14:06:23 +0000 (+0300)
Subject: gcc6 fix
X-Git-Tag: auto/th/rpm-5.4.15-40~2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm.git;a=commitdiff_plain;h=7feffaab205d050cea93f684d48b7b5e68a16051;hp=ec7b8d8fb16f5789772693ff807e0a93a5c653e4

gcc6 fix

/usr/include/c++/6.3.0/cstdlib:143:11: error: ‘::getenv’ has not been declared
    using ::getenv;
            ^~~~~~
---

diff --git a/gcc6-stdlib.patch b/gcc6-stdlib.patch
new file mode 100644
index 0000000..4274a97
--- /dev/null
+++ b/gcc6-stdlib.patch
@@ -0,0 +1,31 @@
+gcc6 hack
+
+http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2017-June/025365.html
+https://patchwork.openembedded.org/patch/122245/
+
+ ---
+
+gcc6 has fixed a long standing c++ include issue where <cheader>
+was different from <header.h> inclusion via
+
+https://gcc.gnu.org/ml/libstdc++/2016-01/msg00025.html
+
+and its also descibed in https://gcc.gnu.org/gcc-6/porting_to.html
+rpmio component uses some .cpp and .cc fies which need to use
+C stdlib.h from C library and not the C++ libstdc++ header
+therefore we pass _GLIBCXX_INCLUDE_NEXT_C_HEADERS so that it
+keeps the old behavior
+--- rpm-5.4.15/rpmio/rpmjni.cc~	2014-08-09 01:08:50.000000000 +0300
++++ rpm-5.4.15/rpmio/rpmjni.cc	2017-06-25 16:42:23.383464974 +0300
+@@ -1,3 +1,4 @@
++#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
+ #include "system.h"
+ #include <rpmlog.h>
+ #include <rpmmacro.h>
+--- rpm-5.4.15/rpmqv.cc~	2017-06-25 17:37:53.000000000 +0300
++++ rpm-5.4.15/rpmqv.cc	2017-06-25 18:01:37.158939691 +0300
+@@ -1,3 +1,4 @@
++#define _GLIBCXX_INCLUDE_NEXT_C_HEADERS
+ #include "system.h"
+ extern const char *__progname;
+ 
diff --git a/rpm.spec b/rpm.spec
index 086e213..f22537a 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -151,6 +151,7 @@ Patch55:	%{name}-disable-hmac-verify.patch
 Patch56:	%{name}-macros.patch
 Patch57:	%{name}-db5.2.patch
 Patch58:	%{name}-preserve-iterator.patch
+Patch59:	gcc6-stdlib.patch
 Patch60:	%{name}-python-sitescriptdir.patch
 Patch61:	%{name}-clean-docdir.patch
 Patch62:	%{name}-DB_CONFIG.patch
@@ -944,6 +945,7 @@ cd -
 %patch56 -p1
 %{!?with_db61:%patch57 -p1}
 %patch58 -p1
+%patch59 -p1
 %patch60 -p1
 %patch61 -p1
 %patch62 -p1