summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2010-06-30 16:53:56 +0300
committerTimo Teräs <timo.teras@iki.fi>2010-06-30 16:55:50 +0300
commitdd6008995a8e8509d71ffa906c837e7a320e8a15 (patch)
tree1fe2c0e36be6763c90ad64f88d8e06e2a4706172 /src
parentfc4c60f233ebe9fe85b7b03d0cf5deec4ab1b32d (diff)
downloadapk-tools-dd6008995a8e8509d71ffa906c837e7a320e8a15.tar.gz
apk-tools-dd6008995a8e8509d71ffa906c837e7a320e8a15.tar.bz2
apk-tools-dd6008995a8e8509d71ffa906c837e7a320e8a15.tar.xz
apk-tools-dd6008995a8e8509d71ffa906c837e7a320e8a15.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile3
l---------src/apk-static.c1
-rw-r--r--src/apk.c4
3 files changed, 7 insertions, 1 deletions
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 <stdio.h>
#include <fcntl.h>
#include <ctype.h>
+#include <errno.h>
#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <getopt.h>
#include <sys/stat.h>
+#include <openssl/crypto.h>
+#ifndef OPENSSL_NO_ENGINE
#include <openssl/engine.h>
+#endif
#include "apk_defines.h"
#include "apk_database.h"