From: Ondřej Surý <ondrej@sury.org>
Date: Mon, 20 Sep 2021 11:38:54 +0000 (+0200)
Subject: Add static Makefile to mysql and mysqldyn DLZ modules
X-Git-Tag: v9.17.19~30^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=67f76b126900d313b343f563353f8237a6a264d2;p=thirdparty%2Fbind9.git

Add static Makefile to mysql and mysqldyn DLZ modules

Previously, the Makefiles for mysql and mysqldyn DLZ modules were
generated from autoconf to get CFLAGS and LIBS for MariaDB or MySQL
libraries.  The static Makefiles uses a simpler method by calling
`mysql_config` directly from the Makefile.
---

diff --git a/contrib/dlz/modules/mysql/Makefile b/contrib/dlz/modules/mysql/Makefile
new file mode 100644
index 00000000000..5c1df7042ae
--- /dev/null
+++ b/contrib/dlz/modules/mysql/Makefile
@@ -0,0 +1,21 @@
+prefix = /usr
+libdir = $(prefix)/lib/bind9
+
+CFLAGS=-fPIC -g -I../include $(shell mysql_config --cflags)
+LDAP_LIBS=$(shell mysql_config --libs)
+
+all: dlz_mysql_dynamic.so
+
+dlz_dbi.o: ../common/dlz_dbi.c
+	$(CC) $(CFLAGS) -c ../common/dlz_dbi.c
+
+dlz_mysql_dynamic.so: dlz_mysql_dynamic.c dlz_dbi.o
+	$(CC) $(CFLAGS) -shared -o dlz_mysql_dynamic.so \
+		dlz_mysql_dynamic.c dlz_dbi.o $(MYSQL_LIBS)
+
+clean:
+	rm -f dlz_mysql_dynamic.so *.o
+
+install: dlz_mysql_dynamic.so
+	mkdir -p $(DESTDIR)$(libdir)
+	install dlz_mysql_dynamic.so $(DESTDIR)$(libdir)
diff --git a/contrib/dlz/modules/mysqldyn/Makefile b/contrib/dlz/modules/mysqldyn/Makefile
new file mode 100644
index 00000000000..bb5643d2a0a
--- /dev/null
+++ b/contrib/dlz/modules/mysqldyn/Makefile
@@ -0,0 +1,21 @@
+prefix = /usr
+libdir = $(prefix)/lib/bind9
+
+CFLAGS=-fPIC -g -I../include $(shell mysql_config --cflags)
+LDAP_LIBS=$(shell mysql_config --libs)
+
+all: dlz_mysqldyn_mod.so
+
+dlz_dbi.o: ../common/dlz_dbi.c
+	$(CC) $(CFLAGS) -c ../common/dlz_dbi.c
+
+dlz_mysqldyn_mod.so: dlz_mysqldyn_mod.c dlz_dbi.o
+	$(CC) $(CFLAGS) -shared -o dlz_mysqldyn_mod.so \
+		dlz_mysqldyn_mod.c dlz_dbi.o $(MYSQL_LIBS)
+
+clean:
+	rm -f dlz_mysqldyn_mod.so *.o
+
+install: dlz_mysqldyn_mod.so
+	mkdir -p $(DESTDIR)$(libdir)
+	install dlz_mysqldyn_mod.so $(DESTDIR)$(libdir)
diff --git a/util/copyrights b/util/copyrights
index b14f01f903e..3ffa566d406 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -951,11 +951,13 @@
 ./contrib/dlz/modules/ldap/testing/example.ldif	X	2013,2018,2019,2020,2021
 ./contrib/dlz/modules/ldap/testing/named.conf	X	2013,2018,2019
 ./contrib/dlz/modules/ldap/testing/slapd.conf	X	2013,2018,2019
+./contrib/dlz/modules/mysql/Makefile		X	2021
 ./contrib/dlz/modules/mysql/dlz_mysql_dynamic.c	X	2013,2016,2018,2019,2020,2021
 ./contrib/dlz/modules/mysql/testing/README	X	2013,2018,2019,2020,2021
 ./contrib/dlz/modules/mysql/testing/dlz.data	X	2013,2017,2018,2019
 ./contrib/dlz/modules/mysql/testing/dlz.schema	X	2013,2018,2019,2020,2021
 ./contrib/dlz/modules/mysql/testing/named.conf	X	2013,2018,2019
+./contrib/dlz/modules/mysqldyn/Makefile		X	2021
 ./contrib/dlz/modules/mysqldyn/README		X	2014,2018,2019,2020,2021
 ./contrib/dlz/modules/mysqldyn/dlz_mysqldyn_mod.c	X	2014,2015,2018,2019,2020,2021
 ./contrib/dlz/modules/mysqldyn/testing/README	X	2014,2018,2019,2020,2021