From: Michal Nowak <mnowak@isc.org>
Date: Mon, 30 May 2022 13:50:15 +0000 (+0200)
Subject: Leverage CFLAGS from environment in contrib Makefiles
X-Git-Tag: v9.19.8~47^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4affc436d3c24ac29a12a712913ebf271fdc648d;p=thirdparty%2Fbind9.git

Leverage CFLAGS from environment in contrib Makefiles
---

diff --git a/contrib/dlz/example/Makefile b/contrib/dlz/example/Makefile
index c4479403e2c..5c66ba1f31b 100644
--- a/contrib/dlz/example/Makefile
+++ b/contrib/dlz/example/Makefile
@@ -16,7 +16,7 @@
 # this means this Makefile is not portable, so the testsuite
 # skips this test on platforms where it doesn't build
 
-CFLAGS=-Wall -fPIC -g
+CFLAGS += -Wall -fPIC -g
 
 all: dlz_example.so
 
diff --git a/contrib/dlz/modules/bdbhpt/Makefile b/contrib/dlz/modules/bdbhpt/Makefile
index 45080af743d..29d6b94cc6b 100644
--- a/contrib/dlz/modules/bdbhpt/Makefile
+++ b/contrib/dlz/modules/bdbhpt/Makefile
@@ -26,7 +26,7 @@
 prefix = /usr
 libdir = $(prefix)/lib/bind9
 
-CFLAGS=-fPIC -g -I../include
+CFLAGS += -fPIC -g -I../include
 BDB_LIBS=-ldb
 
 all: dlz_bdbhpt_dynamic.so
diff --git a/contrib/dlz/modules/filesystem/Makefile b/contrib/dlz/modules/filesystem/Makefile
index 40ecb79c5b4..6c5470f343e 100644
--- a/contrib/dlz/modules/filesystem/Makefile
+++ b/contrib/dlz/modules/filesystem/Makefile
@@ -26,7 +26,7 @@
 prefix = /usr
 libdir = $(prefix)/lib/bind9
 
-CFLAGS=-fPIC -g -I../include
+CFLAGS += -fPIC -g -I../include
 
 all: dlz_filesystem_dynamic.so
 
diff --git a/contrib/dlz/modules/ldap/Makefile b/contrib/dlz/modules/ldap/Makefile
index 8e86e3ef979..d9b6ff5bfef 100644
--- a/contrib/dlz/modules/ldap/Makefile
+++ b/contrib/dlz/modules/ldap/Makefile
@@ -26,7 +26,7 @@
 prefix = /usr
 libdir = $(prefix)/lib/bind9
 
-CFLAGS=-fPIC -g -I../include
+CFLAGS += -fPIC -g -I../include
 LDAP_LIBS=-lldap
 
 all: dlz_ldap_dynamic.so
diff --git a/contrib/dlz/modules/mysql/Makefile b/contrib/dlz/modules/mysql/Makefile
index 606dcefe6cf..5d0904c13f1 100644
--- a/contrib/dlz/modules/mysql/Makefile
+++ b/contrib/dlz/modules/mysql/Makefile
@@ -26,7 +26,7 @@
 prefix = /usr
 libdir = $(prefix)/lib/bind9
 
-CFLAGS=-fPIC -g -I../include $(shell mysql_config --cflags)
+CFLAGS += -fPIC -g -I../include $(shell mysql_config --cflags)
 MYSQL_LIBS=$(shell mysql_config --libs)
 
 all: dlz_mysql_dynamic.so
diff --git a/contrib/dlz/modules/mysqldyn/Makefile b/contrib/dlz/modules/mysqldyn/Makefile
index 38fe4ff9b18..f78cd2ff2e1 100644
--- a/contrib/dlz/modules/mysqldyn/Makefile
+++ b/contrib/dlz/modules/mysqldyn/Makefile
@@ -26,7 +26,7 @@
 prefix = /usr
 libdir = $(prefix)/lib/bind9
 
-CFLAGS=-fPIC -g -I../include $(shell mysql_config --cflags)
+CFLAGS += -fPIC -g -I../include $(shell mysql_config --cflags)
 MYSQL_LIBS=$(shell mysql_config --libs)
 
 all: dlz_mysqldyn_mod.so
diff --git a/contrib/dlz/modules/sqlite3/Makefile b/contrib/dlz/modules/sqlite3/Makefile
index b7861ded55e..1532921b95f 100644
--- a/contrib/dlz/modules/sqlite3/Makefile
+++ b/contrib/dlz/modules/sqlite3/Makefile
@@ -26,7 +26,7 @@
 prefix = /usr
 libdir = $(prefix)/lib/bind9
 
-CFLAGS=-fPIC -g -I../include
+CFLAGS += -fPIC -g -I../include
 SQLITE3_LIBS=-lsqlite3
 
 all: dlz_sqlite3_dynamic.so
diff --git a/contrib/dlz/modules/wildcard/Makefile b/contrib/dlz/modules/wildcard/Makefile
index d09a83a8bec..087a3538e96 100644
--- a/contrib/dlz/modules/wildcard/Makefile
+++ b/contrib/dlz/modules/wildcard/Makefile
@@ -27,7 +27,7 @@
 prefix = /usr
 libdir = $(prefix)/lib/bind9
 
-CFLAGS=-fPIC -g -I../include
+CFLAGS += -fPIC -g -I../include
 
 all: dlz_wildcard_dynamic.so