[Pkg-openldap-devel] [openldap] 03/03: Fix FTBFS with gcc-5. (#778045)

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch master
in repository openldap.

commit e0aa61b95614ffebfeb07501e29cb2762e0c63bd
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Sat Jun 27 18:55:59 2015 +0000

    Fix FTBFS with gcc-5. (#778045)
---
 debian/changelog                                   |  1 +
 .../ITS-8056-fix-libdb-detection-with-gcc-5.patch  | 43 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 45 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index a3e540b..ecc1ddb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ openldap (2.4.40+dfsg-2) UNRELEASED; urgency=medium
   * Actually install libldap-2.4-2.symbols.
   * Update Standards-Version to 3.9.6.
   * Build-Depend on debhelper (>= 9) to fix a Lintian warning.
+  * Import upstream patch to fix FTBFS with gcc-5. (Addresses #778045)
 
  -- Ryan Tandy <ryan at nardis.ca>  Mon, 04 May 2015 21:40:15 -0700
 
diff --git a/debian/patches/ITS-8056-fix-libdb-detection-with-gcc-5.patch b/debian/patches/ITS-8056-fix-libdb-detection-with-gcc-5.patch
new file mode 100644
index 0000000..be1b36e
--- /dev/null
+++ b/debian/patches/ITS-8056-fix-libdb-detection-with-gcc-5.patch
@@ -0,0 +1,43 @@
+From 2dfac1755cea5bfe960aeedbea31d40b2678c4c7 Mon Sep 17 00:00:00 2001
+From: Jan Synacek <jsynacek at redhat.com>
+Date: Wed, 11 Feb 2015 10:32:28 +0100
+Subject: [PATCH] ITS#8056 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 5d27cc3..fa8ff03 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.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 3b93b7d..edfe6df 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,3 +24,4 @@ ITS6035-olcauthzregex-needs-restart.patch
 ITS8027-deref-reject-empty-attr-list.patch
 ITS8046-fix-vrFilter_free-crash.patch
 ITS7975-fix-mdb-onelevel-search.patch
+ITS-8056-fix-libdb-detection-with-gcc-5.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git