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.cute-signatures
parent
fc4c60f233
commit
dd6008995a
|
@ -1,4 +1,5 @@
|
||||||
apk
|
apk
|
||||||
|
apk.static
|
||||||
*.o
|
*.o
|
||||||
*.d
|
*.d
|
||||||
*.cmd
|
*.cmd
|
||||||
|
|
|
@ -41,9 +41,10 @@ endif
|
||||||
|
|
||||||
CFLAGS_ALL += -D_ATFILE_SOURCE
|
CFLAGS_ALL += -D_ATFILE_SOURCE
|
||||||
CFLAGS_apk.o := -DAPK_VERSION=\"$(FULL_VERSION)\"
|
CFLAGS_apk.o := -DAPK_VERSION=\"$(FULL_VERSION)\"
|
||||||
|
CFLAGS_apk-static.o := -DAPK_VERSION=\"$(FULL_VERSION)\" -DOPENSSL_NO_ENGINE
|
||||||
|
|
||||||
progs-$(STATIC) += apk.static
|
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.static := -static
|
||||||
LDFLAGS_apk += -nopie -L$(obj)
|
LDFLAGS_apk += -nopie -L$(obj)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
apk.c
|
|
@ -12,13 +12,17 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
#include <errno.h>
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <getopt.h>
|
#include <getopt.h>
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
|
#include <openssl/crypto.h>
|
||||||
|
#ifndef OPENSSL_NO_ENGINE
|
||||||
#include <openssl/engine.h>
|
#include <openssl/engine.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "apk_defines.h"
|
#include "apk_defines.h"
|
||||||
#include "apk_database.h"
|
#include "apk_database.h"
|
||||||
|
|
Loading…
Reference in New Issue