[Pkg-openldap-devel] [openldap] 03/06: Stop exporting CPP

[Ryan Tandy]

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

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

commit 480fd015f7c68328d6cdc69ef0e9029c5c62c6af
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Fri Jul 24 08:37:42 2015 -0700

    Stop exporting CPP
---
 debian/changelog | 2 ++
 debian/rules     | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9b84b33..4e7d826 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,8 @@ openldap (2.4.41+dfsg-1ubuntu1) UNRELEASED; urgency=medium
     - Show distribution in version:
       - d/control: added lsb-release
       - d/patches/fix-ldap-distribution.patch: show distribution in version
+  * Dropped changes:
+    - Fix cpp calls for GCC 5: fixed upstream (ITS#8056)
   * Upstream fixes:
     - slapd crash with auditlog overlay and large (~27KB) attribute values
       (ITS#8003) (LP: #1461276)
diff --git a/debian/rules b/debian/rules
index 7a04260..a438cb0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,6 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
-export CPP      := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)-gcc -E -P
-
 CONFIG		= $(shell grep -v "^\#" debian/configure.options)
 ifneq ($(DEB_HOST_ARCH_OS),linux)
 	CONFIG += --disable-mdb

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