commit dd6008995a8e8509d71ffa906c837e7a320e8a15 Author: Timo Teräs Date: Wed Jun 30 16:53:56 2010 +0300 static build: do not use openssl engines We want minimal static build. And this now also breaks with our openssl since it tries to automatically dlopen some of the engine modules. diff --git a/.gitignore b/.gitignore index f6f9cf6..2b22f52 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ apk +apk.static *.o *.d *.cmd diff --git a/src/Makefile b/src/Makefile index bea288e..c9cda6a 100644 --- a/src/Makefile +++ b/src/Makefile @@ -41,9 +41,10 @@ endif CFLAGS_ALL += -D_ATFILE_SOURCE CFLAGS_apk.o := -DAPK_VERSION=\"$(FULL_VERSION)\" +CFLAGS_apk-static.o := -DAPK_VERSION=\"$(FULL_VERSION)\" -DOPENSSL_NO_ENGINE progs-$(STATIC) += apk.static -apk.static-objs := $(apk-objs) +apk.static-objs := $(filter-out apk.o,$(apk-objs)) apk-static.o LDFLAGS_apk.static := -static LDFLAGS_apk += -nopie -L$(obj) diff --git a/src/apk-static.c b/src/apk-static.c new file mode 120000 index 0000000..bf745af --- /dev/null +++ b/src/apk-static.c @@ -0,0 +1 @@ +apk.c \ No newline at end of file diff --git a/src/apk.c b/src/apk.c index 81bb950..4196f74 100644 --- a/src/apk.c +++ b/src/apk.c @@ -12,13 +12,17 @@ #include #include #include +#include #include #include #include #include #include +#include +#ifndef OPENSSL_NO_ENGINE #include +#endif #include "apk_defines.h" #include "apk_database.h"