make sign and fetchurl statically linked

[zpackage] / Makefile

diff --git a/Makefile b/Makefile
index 6358c207a42a6a6d01d56eba0c22cfa3a6176509..938d33678163b9644b6bc1000cdb92d007e76c0d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ lib/jsw/jsw_rbtree.c
 JSWOBJ=$(JSWSRC:%.c=%.o)
 LIBZPMSRC=sha256.c db.c compress.c uncompress.c zpm.c zpm_hash.c \
          foreach_path.c vercmp.c findpkg.c quote.c dbquery.c script_hash.c \
-         parse.c integ.c seterror.c notes.c
+         parse.c integ.c seterror.c notes.c createpkg.c
 
 LIBZPMOBJ=$(addprefix lib/, $(LIBZPMSRC:%.c=%.o))
 
@@ -31,7 +31,8 @@ curdir=$(shell pwd)
 ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \
        zpm-findpkg zpm-shell zpm-soneed zpm-foreach-path zpm-parse \
        zpm-script zpm-soname zpm-syncfs zpm-packagehash zpm-verify \
-       zpm-elftype zpm-quote zpm-note zpm-search zpm-add zpm-fetchurl
+       zpm-elftype zpm-quote zpm-note zpm-search zpm-add zpm-fetchurl \
+       zpm-sign
 
 SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-test zpm-log \
        zpm-contents zpm-uninstall zpm-pathmod zpm-rmpackage zpm-newpackage \
@@ -181,7 +182,7 @@ newdb.c: db.sql
        echo ", 0};" >> $@
 
 sqlite/sqlite3.o: sqlite/sqlite3.c sqlite/config.h
-       $(CC) -O3 -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
+       $(CC) -Wall -std=c99 -Ilib -D_HAVE_SQLITE_CONFIG_H=1 -c -o $@ $<
 
 sqlite/extensions.o: sqlite/extensions.c
        $(CC) -O3 -Wall -std=c99 -I. -Isqlite -DSQLITE_CORE=1 -c -o $@ $<
@@ -236,9 +237,12 @@ TLSOBJ= tlse.o x25519.o chacha.o base64.o pem.o forward.o handshake.o \
 crypto/x25519.o: $(addprefix crypto/ref10/, $(X255OBJ))
        ld -o $@ -r $+
 
-crypto/%.o: CFLAGS+=-Icrypto -DTFM_DESC -DTFM_NO_ASM -Itomsfastmath/src/headers \
+crypto/%.o: CFLAGS+=-Icrypto -DTFM_DESC -DTFM_NO_ASM \
+       -Itomsfastmath/src/headers -static \
        -Wno-pointer-sign -Wno-missing-braces -Ilibtomcrypt/src/headers
 
+#      -DDEBUG
+
 #      /usr/musl/bin/musl-clang -Wall -Wextra -Wno-missing-braces -Werror -Wno-pointer-sign -I. -DTFM_DESC -DTFM_NO_ASM -I ../libtomcrypt/src/headers -I ../tomsfastmath/src/headers -DSTRICT_TLS -DIGNORE_SESSION_ID --rtlib=compiler-rt   -c -o tlse.o tlse.c
 
 #/usr/musl/bin/musl-clang -Wall -Wextra -Wno-missing-braces -Werror -Wno-pointer-sign -I. -DTFM_DESC -DTFM_NO_ASM -I ../libtomcrypt/src/headers -I ../tomsfastmath/src/headers -DSTRICT_TLS -DIGNORE_SESSION_ID --rtlib=compiler-rt   -c -o tlse.o tlse.c
@@ -766,7 +770,7 @@ rfc3986: rfc3986.c
 src/fetchurl.o: CFLAGS+=-DTFM_DESC -Isrc/headers -Itomsfastmath/src/headers -DARGTYPE=4 -DLTC_NO_ASM -DTFM_NO_ASM -Ilibtomcrypt/src/headers -DLTC_SOURCE -Icrypto -Wno-pointer-sign -DDEBUG
 
 zpm-fetchurl: ltc.o tls.o tfm.o src/fetchurl.o crypto/https.o crypto/rfc3986.o
-       $(CC) $(CFLAGS) -o $@ $+
+       $(CC) $(CFLAGS) -static -o $@ $+
 
 testddg: zpm-fetchurl
        ./zpm-fetchurl duckduckgo.com 443 /
@@ -790,7 +794,7 @@ SIGNOBJ=$(SIGNSRC:.c=.o)
 $(SIGNOBJ): CFLAGS+=-Icrypto/libeddsa/lib
 
 zpm-sign: $(SIGNOBJ)
-       $(CC) $(CFLAGS) -o $@ $+
+       $(CC) $(CFLAGS) -static -o $@ $+
 
 clean:
        rm -f *.o sqlite/*.o lib/*.o $(LZMAOBJ) liblzma.a \