0001-headerscheck-Use-ICU_CFLAGS.patch

text/plain

Filename: 0001-headerscheck-Use-ICU_CFLAGS.patch
Type: text/plain
Part: 0
Message: Re: headerscheck warnings with late-model gcc

Patch

Format: format-patch
Series: patch 0001
Subject: headerscheck: Use ICU_CFLAGS
File+
src/tools/pginclude/headerscheck 3 2
From f40b5a065d96b3bca7c1e535cee81c89ee202c9e Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter@eisentraut.org>
Date: Thu, 7 Aug 2025 15:55:04 +0200
Subject: [PATCH 1/4] headerscheck: Use ICU_CFLAGS

Otherwise, headerscheck will fail if the ICU headers are in a location
not reached by the normal CFLAGS/CPPFLAGS:

../src/include/utils/pg_locale.h:21:10: fatal error: unicode/ucol.h: No such file or directory
---
 src/tools/pginclude/headerscheck | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/tools/pginclude/headerscheck b/src/tools/pginclude/headerscheck
index 9e86d049362..30afa967305 100755
--- a/src/tools/pginclude/headerscheck
+++ b/src/tools/pginclude/headerscheck
@@ -44,6 +44,7 @@ CXXFLAGS=${CXXFLAGS:- -fsyntax-only -Wall}
 MGLOB="$builddir/src/Makefile.global"
 CPPFLAGS=`sed -n 's/^CPPFLAGS[ 	]*=[ 	]*//p' "$MGLOB"`
 CFLAGS=`sed -n 's/^CFLAGS[ 	]*=[ 	]*//p' "$MGLOB"`
+ICU_CFLAGS=`sed -n 's/^ICU_CFLAGS[ 	]*=[ 	]*//p' "$MGLOB"`
 CC=`sed -n 's/^CC[ 	]*=[ 	]*//p' "$MGLOB"`
 CXX=`sed -n 's/^CXX[ 	]*=[ 	]*//p' "$MGLOB"`
 PG_SYSROOT=`sed -n 's/^PG_SYSROOT[ 	]*=[ 	]*//p' "$MGLOB"`
@@ -64,11 +65,11 @@ if $cplusplus; then
 	    -I*|-D*) CXXPPFLAGS="$CXXPPFLAGS $flag";;
 	  esac
 	done
-	COMPILER_FLAGS="$CXXPPFLAGS $CXXFLAGS"
+	COMPILER_FLAGS="$CXXPPFLAGS $CXXFLAGS $ICU_CFLAGS"
 else
 	ext=c
 	COMPILER=${CC:-gcc}
-	COMPILER_FLAGS="$CPPFLAGS $CFLAGS"
+	COMPILER_FLAGS="$CPPFLAGS $CFLAGS $ICU_CFLAGS"
 fi
 
 # Create temp directory.
-- 
2.50.1