]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Add static Makefile to mysql and mysqldyn DLZ modules
authorOndřej Surý <ondrej@sury.org>
Mon, 20 Sep 2021 11:38:54 +0000 (13:38 +0200)
committerOndřej Surý <ondrej@sury.org>
Mon, 20 Sep 2021 20:26:17 +0000 (22:26 +0200)
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.

contrib/dlz/modules/mysql/Makefile [new file with mode: 0644]
contrib/dlz/modules/mysqldyn/Makefile [new file with mode: 0644]
util/copyrights

diff --git a/contrib/dlz/modules/mysql/Makefile b/contrib/dlz/modules/mysql/Makefile
new file mode 100644 (file)
index 0000000..5c1df70
--- /dev/null
@@ -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 (file)
index 0000000..bb5643d
--- /dev/null
@@ -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)
index b14f01f903e72ab5e8912fd34215885e5d8846bf..3ffa566d406dbfc5641d21219b4d256892a048e7 100644 (file)
 ./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