X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=Makefile;h=969127610e1ff39b276402801a4c1a841a301516;hp=5b677ca0356baa9eb73860836f9a30ccc6f70867;hb=09c80a1f8918d888063f4d1a75921a99fe5f0b5c;hpb=66bc25938679f1d6a1d1200f329093d82a5e99b4

diff --git a/Makefile b/Makefile
index 5b677ca..9691276 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,16 @@
 CC=clang --target=x86_64-pc-linux-musl
 CC=/usr/musl/bin/musl-clang
+LD=lld
 #CC=/usr/musl/bin/musl-gcc
 #CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api --target=x86_64-pc-linux-musl
-CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api
+CFLAGS=-Wall -W -Wextra -Werror -Wno-implicit-fallthrough -std=c99 -Ilib -Isqlite -Ielf -I. -Ilzma/api -Wno-unused-command-line-argument
 
 ZPMVER:=$(shell git describe --tags --match 'v[0-9]*' | sed -e 's/^v//' | sed -e 's/-g.\+//' | sed -e 's/-/./g')
 
 LZMAFLAGS=-Ilzma/api -Ilzma/tuklib -Ilzma/lzma -Ilzma/common -Ilzma/check -Ilzma/lz -Ilzma/rangecoder -Ilzma/simple -Ilzma/delta -DHAVE_CHECK_CRC64 -DHAVE_CHECK_CRC32 -DHAVE_ENCODER_LZMA2 -DHAVE_DECODER_LZMA2 -DHAVE_MF_BT4
 
-LDFLAGS=-fuse-ld=lld -L. -static
+#LDFLAGS=-fuse-ld=lld -L. -static
+LDFLAGS=-fuse-ld=/usr/musl/bin/ld.musl-clang -L. -static
 
 LZMACHECKSRC=lzma/check/check.c lzma/check/crc32_fast.c lzma/check/crc64_fast.c lzma/check/crc32_table.c lzma/check/crc64_table.c
 LZMASRC=$(shell ls lzma/lzma/*.c lzma/common/*.c lzma/lz/*.c) $(LZMACHECKSRC) lzma/rangecoder/price_table.c
@@ -22,7 +24,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,13 +33,15 @@ 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-preserve zpm-test zpm-log \
+SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-test zpm-log \
 	zpm-contents zpm-uninstall zpm-pathmod zpm-rmpackage zpm-newpackage \
 	zpm-pkg zpm-pkgfile zpm-gc zpm-repo zpm-update zpm-confgit
 
-MANPAGES=doc/zpm.8 $(addprefix doc/zpm-, list.8 contents.8 hash.8 quote.8 pathmod.8 note.8 vercmp.8 repo.8 gc.8)
+MANPAGES=$(shell ls doc/*.8)
+#MANPAGES=doc/zpm.8 $(addprefix doc/zpm-, list.8 contents.8 hash.8 quote.8 pathmod.8 note.8 vercmp.8 repo.8 gc.8)
 COMPILED=$(ZPKGBIN)
 PROGRAMS=$(SCRIPTS) $(COMPILED)
 
@@ -109,61 +113,64 @@ programs: $(ZPKGBIN)
 uncompress: uncompress.o 
 	$(CC) $(CFLAGS) -o $@ $+ -llzma
 
-zpm-elftype: elf/elftype.c
-	$(CC) -Ielf $(CFLAGS) -o $@ $+
+zpm-elftype: elf/elftype.o
+	$(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+
 
-zpm-soname: elf/soname.c
-	$(CC) -Ielf $(CFLAGS) -o $@ $+
+zpm-soname: elf/soname.o
+	$(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+
 
-zpm-soneed: elf/needed.c
-	$(CC) -Ielf $(CFLAGS) -o $@ $+
+zpm-soneed: elf/needed.o
+	$(CC) $(CFLAGS) -Ielf $(LDFLAGS) -o $@ $+
 
-zpm-addfile: zpm-addfile.o libzpm.a libelf.a
+zpm-addfile: src/addfile.o libzpm.a libelf.a
 	$(CC) -Ielf $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-hash: zpm-hash.o libzpm.a
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
+zpm-hash: src/hash.o libzpm.a
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm
 
-zpm-verify: zpm-verify.o t/ctap/ctap.o libzpm.a
+zpm-verify: src/verify.o t/ctap/ctap.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< t/ctap/ctap.o -lzpm -lelf
 
-zpm-init: zpm-init.o libzpm.a
+zpm-init: src/init.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-extract: zpm-extract.o libzpm.a
+zpm-stat: src/stat.o
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+
+zpm-extract: src/extract.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-script: zpm-script.o libzpm.a
+zpm-script: src/script.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 	
-zpm-packagehash: zpm-packagehash.o libzpm.a
+zpm-packagehash: src/packagehash.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-foreach-path.o: CFLAGS+=-Wno-unused-parameter
-zpm-script.o: CFLAGS+=-Wno-unused-parameter
+src/foreach-path.o: CFLAGS+=-Wno-unused-parameter
+src/script.o: CFLAGS+=-Wno-unused-parameter
 
-zpm-foreach-path: zpm-foreach-path.o libzpm.a sqlite/sqlite3.h
+zpm-foreach-path: src/foreach-path.o libzpm.a sqlite/sqlite3.h
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-findpkg: zpm-findpkg.o libzpm.a
+zpm-findpkg: src/findpkg.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-search: zpm-search.o libzpm.a
+zpm-search: src/search.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-note: zpm-note.o libzpm.a
+zpm-note: src/note.o libzpm.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-syncfs: zpm-syncfs.o libzpm.a libelf.a
+zpm-syncfs: src/syncfs.o libzpm.a libelf.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf -lm
 
-zpm-parse: zpm-parse.o lib/parse.o
+zpm-parse: src/parse.o lib/parse.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 
-zpm-add: zpm-add.o libzpm.a libelf.a
+zpm-add: src/add.o libzpm.a libelf.a
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lzpm -lelf
 
-zpm-quote: zpm-quote.o
+zpm-quote: src/quote.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
 
 db.sql: schema/main.sql schema/syncconflicts.sql schema/syncinfo.sql schema/preserve_packages.sql schema/age.sql
@@ -177,20 +184,20 @@ 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 -Wno-unused-command-line-argument -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 $@ $<
 
 sqlite/shell.o: sqlite/shell.c sqlite/config.h Makefile
-	$(CC) -Wall -std=c99 -Ilib \
+	$(CC) -Wall -Wno-unused-command-line-argument -std=c99 -Ilib \
 		-DSQLITE_OMIT_LOAD_EXTENSION=1 \
 		'-DSQLITE_SHELL_INIT_PROC(x)=zpm_setup_extensions(x)' \
 		-D_POSIX_C_SOURCE=200112L -c -o $@ $<
 
 lib/zpm.o: newdb.c
 
-zpm-vercmp: zpm-vercmp.o lib/vercmp.o
+zpm-vercmp: src/vercmp.o lib/vercmp.o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+
 	
 zpm-shell: sqlite/sqlite3.o sqlite/shell.o sqlite/extensions.o lib/vercmp.o
@@ -201,6 +208,8 @@ libelf.a: elf/libelf.o
 
 install: $(COMPILED) $(MANPAGES)
 	test -d $(DESTDIR)/sbin || install -d $(DESTDIR)/sbin
+	test -d $(DESTDIR)/var/lib/zpm || install -d $(DESTDIR)/var/lib/zpm
+	test -d $(DESTDIR)/var/lib/zpm/packages || install -d $(DESTDIR)/var/lib/zpm/packages
 	install $(PROGRAMS) $(DESTDIR)/sbin
 	mkdir -p $(DESTDIR)/usr/share/man/man8
 	install -m644 $(MANPAGES) $(DESTDIR)/usr/share/man/man8
@@ -232,9 +241,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 \
 	-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
@@ -759,9 +771,10 @@ crypto/rfc3986.c: crypto/rfc3986.re
 rfc3986: rfc3986.c
 	$(CC) -Wall -W -Wextra -Werror -o $@ $+
 
-zpm-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
+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
 
-zpm-fetchurl: ltc.o tls.o tfm.o zpm-fetchurl.o crypto/https.o crypto/rfc3986.o
+zpm-fetchurl: ltc.o tls.o tfm.o src/fetchurl.o crypto/https.o crypto/rfc3986.o
+	$(CC) $(CFLAGS) -static -o $@ $+
 
 testddg: zpm-fetchurl
 	./zpm-fetchurl duckduckgo.com 443 /
@@ -769,6 +782,25 @@ testddg: zpm-fetchurl
 testgra: zpm-fetchurl
 	./zpm-fetchurl granicus.if.org 443 /
 
+SIGNSRC= \
+crypto/libeddsa/sign.c \
+crypto/libeddsa/lib/burn.c \
+crypto/libeddsa/lib/burnstack.c \
+crypto/libeddsa/lib/ed.c \
+crypto/libeddsa/lib/ed25519-sha512.c \
+crypto/libeddsa/lib/fld.c \
+crypto/libeddsa/lib/sc.c \
+crypto/libeddsa/lib/sha512.c \
+crypto/libeddsa/lib/x25519.c
+
+SIGNOBJ=$(SIGNSRC:.c=.o)
+
+$(SIGNOBJ): CFLAGS=-Wall -Wextra -W -Werror -Wno-pointer-sign \
+	-Icrypto/libeddsa/lib -Wno-unused-command-line-argument
+
+zpm-sign: $(SIGNOBJ)
+	$(CC) -Wall -Wextra -W -Werror -Wno-unused-command-line-argument -static -o $@ $+
+
 clean:
 	rm -f *.o sqlite/*.o lib/*.o $(LZMAOBJ) liblzma.a \
 		libelf.a libzpm.a zpm-addfile soname \
@@ -782,4 +814,5 @@ clean:
 		$(addprefix crypto/, $(TLSOBJ)) \
 		$(addprefix tomsfastmath/src/, $(TFMOBJ)) \
 		$(addprefix libtomcrypt/src/, $(LTCOBJ)) \
+		$(SIGNOBJ) \
 		x25519.o