openldap/patches/openldap-2.4.40-gcc5.patch

From f0409f40dab6013d1aec05f5c86ae31d2f49b485 Mon Sep 17 00:00:00 2001
From: Jan Synacek <jsynacek@redhat.com>
Date: Wed, 11 Feb 2015 10:32:28 +0100
Subject: [PATCH] fix libdb detection with gcc 5

The old cpp version generated:
__db_version 5

The new output:
__db_version
            5

Running cpp with -P (inhibit linemarkers generation) fixes this when using gcc 5.
Behavior with older versions of gcc is not changed.
---
 build/openldap.m4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/openldap.m4 b/build/openldap.m4
index caf8fc2..bdcb4d6 100644
--- a/build/openldap.m4
+++ b/build/openldap.m4
@@ -328,7 +328,7 @@ AC_DEFUN([OL_BDB_HEADER_VERSION],
 #endif
 __db_version DB_VERSION_MAJOR
 ])
-	set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
+	set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
 	ol_cv_bdb_major=${3}
 ])
 case $ol_cv_bdb_major in [[1-9]]*) : ;; *)
@@ -344,7 +344,7 @@ AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[
 #endif
 __db_version DB_VERSION_MINOR
 ])
-	set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
+	set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
 	ol_cv_bdb_minor=${3}
 ])
 case $ol_cv_bdb_minor in [[0-9]]*) : ;; *)
-- 
2.1.0

1	niro	2590	From f0409f40dab6013d1aec05f5c86ae31d2f49b485 Mon Sep 17 00:00:00 2001
2			From: Jan Synacek <jsynacek@redhat.com>
3			Date: Wed, 11 Feb 2015 10:32:28 +0100
4			Subject: [PATCH] fix libdb detection with gcc 5
5
6			The old cpp version generated:
7			__db_version 5
8
9			The new output:
10			__db_version
11			5
12
13			Running cpp with -P (inhibit linemarkers generation) fixes this when using gcc 5.
14			Behavior with older versions of gcc is not changed.
15			---
16			build/openldap.m4 \| 4 ++--
17			1 file changed, 2 insertions(+), 2 deletions(-)
18
19			diff --git a/build/openldap.m4 b/build/openldap.m4
20			index caf8fc2..bdcb4d6 100644
21			--- a/build/openldap.m4
22			+++ b/build/openldap.m4
23			@@ -328,7 +328,7 @@ AC_DEFUN([OL_BDB_HEADER_VERSION],
24			#endif
25			__db_version DB_VERSION_MAJOR
26			])
27			- set X `eval "$ac_cpp conftest.$ac_ext" \| $EGREP __db_version` none none
28			+ set X `eval "$ac_cpp -P conftest.$ac_ext" \| $EGREP __db_version` none none
29			ol_cv_bdb_major=${3}
30			])
31			case $ol_cv_bdb_major in [[1-9]]) : ;; )
32			@@ -344,7 +344,7 @@ AC_CACHE_CHECK([for Berkeley DB minor version in db.h], [ol_cv_bdb_minor],[
33			#endif
34			__db_version DB_VERSION_MINOR
35			])
36			- set X `eval "$ac_cpp conftest.$ac_ext" \| $EGREP __db_version` none none
37			+ set X `eval "$ac_cpp -P conftest.$ac_ext" \| $EGREP __db_version` none none
38			ol_cv_bdb_minor=${3}
39			])
40			case $ol_cv_bdb_minor in [[0-9]]) : ;; )
41			--
42			2.1.0
43