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

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=d762f80120362673fb854e593997f6321b822402

commit d762f80120362673fb854e593997f6321b822402
Author: Guillem Jover <[email protected]>
AuthorDate: Mon Jun 5 18:01:35 2023 +0200

    build: Namespace COMPILER_*FLAGS with DPKG_
    
    Make it clear these are flags for dpkg itself.
---
 m4/dpkg-compiler.m4 | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/m4/dpkg-compiler.m4 b/m4/dpkg-compiler.m4
index 01445317d..eab27d595 100644
--- a/m4/dpkg-compiler.m4
+++ b/m4/dpkg-compiler.m4
@@ -12,14 +12,16 @@ AC_DEFUN([DPKG_CHECK_COMPILER_FLAG], [
     m4_define([dpkg_compiler], [$CC])
     m4_define([dpkg_varname], [CFLAGS])
     m4_define([dpkg_varname_save], [dpkg_save_CFLAGS])
-    m4_define([dpkg_varname_export], [COMPILER_CFLAGS])
+    m4_define([dpkg_varname_export], [DPKG_COMPILER_CFLAGS])
+    m4_pattern_allow([DPKG_COMPILER_CFLAGS])
     AS_VAR_PUSHDEF([dpkg_varname_cache], [dpkg_cv_cflags_$1])
   ],
   [C++], [
     m4_define([dpkg_compiler], [$CXX])
     m4_define([dpkg_varname], [CXXFLAGS])
     m4_define([dpkg_varname_save], [dpkg_save_CXXFLAGS])
-    m4_define([dpkg_varname_export], [COMPILER_CXXFLAGS])
+    m4_define([dpkg_varname_export], [DPKG_COMPILER_CXXFLAGS])
+    m4_pattern_allow([DPKG_COMPILER_CXXFLAGS])
     AS_VAR_PUSHDEF([dpkg_varname_cache], [dpkg_cv_cxxflags_$1])
   ])
   AC_CACHE_CHECK([whether ]dpkg_compiler[ accepts $1], [dpkg_varname_cache], [
@@ -132,8 +134,8 @@ AC_DEFUN([DPKG_COMPILER_WARNINGS], [
     DPKG_CHECK_COMPILER_WARNINGS
     AC_LANG_POP([C++])
 
-    CFLAGS="$COMPILER_CFLAGS $CFLAGS"
-    CXXFLAGS="$COMPILER_CXXFLAGS $CXXFLAGS"
+    CFLAGS="$DPKG_COMPILER_CFLAGS $CFLAGS"
+    CXXFLAGS="$DPKG_COMPILER_CXXFLAGS $CXXFLAGS"
   ])
 ])
 

-- 
Dpkg.Org's dpkg

Reply via email to