Index: config.lua ================================================================== --- config.lua +++ config.lua @@ -256,12 +256,8 @@ end end end end -pkg('mbedtls') -pkg('mongoose') -pkg('json-c') -pkg('libc') -pkg('libpq') +for k in pairs(fallback) do pkg(k) end return conf Index: makefile ================================================================== --- makefile +++ makefile @@ -27,18 +27,18 @@ install: parsav mkdir $(prefix)/bin cp $< $(prefix)/bin/ -dep: dep.mbedtls dep.mongoose dep.json-c +dep: dep.mbedtls dep.mongoose dep.mjson dep.mbedtls: lib/mbedtls/library/libmbedtls.a \ lib/mbedtls/library/libmbedcrypto.a \ lib/mbedtls/library/libmbedx509.a dep.mongoose: lib/mongoose/libmongoose.a -dep.json-c: lib/json-c/libjson-c.a +dep.mjson: lib/mjson/libmjson.a -static-libs = lib/json-c/libjson-c.a \ +static-libs = lib/mjson/libmjson.a \ lib/mongoose/libmongoose.a \ lib/mbedtls/library/libmbedx509.a \ lib/mbedtls/library/libmbedcrypto.a \ lib/mbedtls/library/libmbedtls.a @@ -51,39 +51,44 @@ xz -c9e $(parsav-dist).tar > $@ rm -r $(parsav-dist){.tar,} lib: mkdir $@ + +lib%.a %.a: %.o + ar rcs $@ $< + ranlib $@ # bsd-ism + # generate a shim static library so mongoose cooperates # with the build apparatus. note that parsav is designed # to be fronted by a real web server like nginx if SSL # is to be used, so we don't turn on SSL in mongoose -lib/mongoose/libmongoose.a: lib/mongoose lib/mongoose/mongoose.c lib/mongoose/mongoose.h - $(CC) -c $