X-Git-Url: https://pd.if.org/git/?p=zpackage;a=blobdiff_plain;f=Makefile;h=969127610e1ff39b276402801a4c1a841a301516;hp=5acbbbddce5627e157710454817413f1176e8165;hb=09c80a1f8918d888063f4d1a75921a99fe5f0b5c;hpb=5dd3c3e64a9574112dda77a5afc167f5daa53fd8 diff --git a/Makefile b/Makefile index 5acbbbd..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,9 +33,10 @@ 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 @@ -181,13 +184,13 @@ 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 $@ $< @@ -205,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 @@ -236,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 @@ -763,10 +771,10 @@ crypto/rfc3986.c: crypto/rfc3986.re rfc3986: rfc3986.c $(CC) -Wall -W -Wextra -Werror -o $@ $+ -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 +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 src/fetchurl.o crypto/https.o crypto/rfc3986.o - $(CC) $(CFLAGS) -o $@ $+ + $(CC) $(CFLAGS) -static -o $@ $+ testddg: zpm-fetchurl ./zpm-fetchurl duckduckgo.com 443 / @@ -775,6 +783,7 @@ 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 \ @@ -782,15 +791,15 @@ 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 \ -crypto/libeddsa/sign.c +crypto/libeddsa/lib/x25519.c SIGNOBJ=$(SIGNSRC:.c=.o) -$(SIGNOBJ): CFLAGS+=-Icrypto/libeddsa/lib +$(SIGNOBJ): CFLAGS=-Wall -Wextra -W -Werror -Wno-pointer-sign \ + -Icrypto/libeddsa/lib -Wno-unused-command-line-argument zpm-sign: $(SIGNOBJ) - $(CC) $(CFLAGS) -o $@ $+ + $(CC) -Wall -Wextra -W -Werror -Wno-unused-command-line-argument -static -o $@ $+ clean: rm -f *.o sqlite/*.o lib/*.o $(LZMAOBJ) liblzma.a \ @@ -805,4 +814,5 @@ clean: $(addprefix crypto/, $(TLSOBJ)) \ $(addprefix tomsfastmath/src/, $(TFMOBJ)) \ $(addprefix libtomcrypt/src/, $(LTCOBJ)) \ + $(SIGNOBJ) \ x25519.o