[apache2] 08/08: Also remove -DBUILD_DATETIME and -fdebug-prefix-map from config_vars.mk

[Stefan Fritsch]

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

sf pushed a commit to branch master
in repository apache2.

commit abb22eb96ee59685de1b606e2b08ef19fc5e8672
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Aug 6 18:48:17 2017 +0200

    Also remove -DBUILD_DATETIME and -fdebug-prefix-map from config_vars.mk
    
    While there, improve comment in debian/rules
---
 debian/changelog         | 2 ++
 debian/clean_config_vars | 4 +++-
 debian/rules             | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e7505a4..ade2faf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ apache2 (2.4.27-4) UNRELEASED; urgency=medium
     - change package priorities from extra to optional
   * Use libprotocol-http2-perl in autopkgtest.
   * Update test suite to svn r1804214.
+  * Also remove -DBUILD_DATETIME and -fdebug-prefix-map from config_vars.mk
+    to avoid them being used by apxs.
 
  -- Stefan Fritsch <sf at debian.org>  Sat, 05 Aug 2017 20:59:48 +0200
 
diff --git a/debian/clean_config_vars b/debian/clean_config_vars
index a713d6b..f88ab3c 100755
--- a/debian/clean_config_vars
+++ b/debian/clean_config_vars
@@ -20,7 +20,9 @@ sub clean_and_deduplicate
 	{
 		#print("FLAG: $flag\n");
 		$return_flags .= "$flag " unless
-			$flag =~ m/PLATFORM/;
+			$flag =~ m/PLATFORM/ ||
+			$flag =~ m/-DBUILD_DATETIME/ ||
+			$flag =~ m/-fdebug-prefix-map/;
 	}
 	return $return_flags;
 }
diff --git a/debian/rules b/debian/rules
index 201391e..4aa18f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,9 +73,9 @@ debian/apache2.preinst: debian/apache2.preinst.in debian/fixup_conffiles.b64 deb
 	debian/create_preinst
 
 clean-config-vars-stamp: debian/tmp/usr/share/apache2/build/config_vars.mk debian/clean_config_vars
-	# Clean up config_vars.mk
-	# FIXME: Maybe someone could document here why we actually need to
-	# cleanup some stuff here
+	# Clean up config_vars.mk so that flags that are only intended for the
+	# compilation of apache2 itself are not used by apxs for compiling
+	# modules.
 	perl ./debian/clean_config_vars '$(AP2_CFLAGS)' '$(AP2_CPPFLAGS)' '$(AP2_LDFLAGS)'
 	touch $@
 

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