From c7088e3f5d9c71e82f4d28f635690d5e88d968bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Pant=C5=AF=C4=8Dek?= Date: Sun, 17 Sep 2023 15:48:41 +0200 Subject: [PATCH] Make sure it links, disable LTO, explicitly link sqlite3.a, keep shared binary format. --- src/Makefile | 13 ++++++++++--- src/mailman3.scm | 3 ++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index 3cbaf92..6c15089 100644 --- a/src/Makefile +++ b/src/Makefile @@ -56,7 +56,8 @@ HACKERBASE-OBJS=hackerbase.o testing.o listing.o cal-month.o \ template-list-expander.o box-drawing.o util-list.o \ export-web-static.o util-dir.o dokuwiki.o racket-kwargs.o \ duck.o util-bst.o util-bst-bdict.o util-bst-ldict.o \ - util-bst-lset.o mailman2.o mailman-common.o mailman3.o + util-bst-lset.o mailman2.o mailman-common.o mailman3.o \ + mailman3-sql.o GENDOC-SOURCES=gendoc.scm duck-extract.import.scm \ util-time.import.scm util-csv.import.scm util-git.import.scm \ @@ -79,7 +80,7 @@ GENDOC-OBJS=gendoc.o duck-extract.o util-time.o util-csv.o util-io.o \ imports: $(HACKERBASE-DEPS) ../hackerbase: $(HACKERBASE-OBJS) - $(CSC) -strip -static -o $@ $(HACKERBASE-OBJS) + $(CSC) -L --no-lto -L -Wl,-static -L -Wl,-lsqlite3 -L -Wl,-Bdynamic -strip -static -o $@ $(HACKERBASE-OBJS) .PHONY: clean clean: @@ -543,7 +544,13 @@ mailman-common.o: mailman-common.import.scm mailman-common.import.scm: $(MAILMAN-COMMON-SOURCES) MAILMAN3-SOURCES=mailman3.scm configuration.import.scm \ - util-io.import.scm + util-io.import.scm mailman3-sql.import.scm \ + util-list.import.scm mailman3.o: mailman3.import.scm mailman3.import.scm: $(MAILMAN3-SOURCES) + +MAILMAN3-SQL-SOURCES=mailman3-sql.scm configuration.import.scm + +mailman3-sql.o: mailman3-sql.import.scm +mailman3-sql.import.scm: $(MAILMAN3-SQL-SOURCES) diff --git a/src/mailman3.scm b/src/mailman3.scm index 73871ad..966e5b2 100644 --- a/src/mailman3.scm +++ b/src/mailman3.scm @@ -42,7 +42,8 @@ (chicken format) configuration util-io - util-list) + util-list + mailman3-sql) ;; Just a convenient converter (define (mailman3:cmd+args0)