diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-12-25 13:20:38 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-01-05 11:09:12 +0100 |
| commit | f6e6341d896adb78f9b496f71aab8f45e1742d5a (patch) | |
| tree | bc4cd06f9a10e5e94c624bdcd374f41ac13a92ff | |
| parent | a46c9a4038f385e53b49b42a1e195b1fc3261842 (diff) | |
| download | upstream-f6e6341d896adb78f9b496f71aab8f45e1742d5a.tar.gz upstream-f6e6341d896adb78f9b496f71aab8f45e1742d5a.tar.bz2 upstream-f6e6341d896adb78f9b496f71aab8f45e1742d5a.zip | |
tools: build libressl on all systems
Useful for having a more consistent build environment and finding API
issues faster
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | include/prereq-build.mk | 14 | ||||
| -rw-r--r-- | tools/Makefile | 6 |
2 files changed, 2 insertions, 18 deletions
diff --git a/include/prereq-build.mk b/include/prereq-build.mk index ed652ca9a7..29b6fbdaa6 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -75,14 +75,6 @@ $(eval $(call TestHostCommand,zlib, \ echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \ gcc -include zlib.h -x c -o $(TMP_DIR)/a.out - $(zlib_link_flags))) -# Xcode deprecated openssl, MacPorts doesn't work nicely for other packages -ifneq ($(HOST_OS),Darwin) -$(eval $(call TestHostCommand,libssl, \ - Please install the openssl library (with development headers), \ - echo 'int main(int argc, char **argv) { SSL_library_init(); return 0; }' | \ - gcc $(HOST_CFLAGS) -include openssl/ssl.h -x c -o $(TMP_DIR)/a.out - -lcrypto -lssl $(HOST_LDFLAGS))) -endif - $(eval $(call TestHostCommand,perl-thread-queue, \ Please install the Perl Thread::Queue module, \ perl -MThread::Queue -e 1)) @@ -164,12 +156,6 @@ $(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.7.12.2, \ $(eval $(call SetupHostCommand,file,Please install the 'file' package, \ file --version 2>&1 | grep file)) -ifneq ($(HOST_OS),Darwin) -$(eval $(call SetupHostCommand,openssl,Please install the 'openssl' utility, \ - openssl version | grep '\(OpenSSL\|LibreSSL\)')) -endif - - # Install ldconfig stub $(eval $(call TestHostCommand,ldconfig-stub,Failed to install stub, \ touch $(STAGING_DIR_HOST)/bin/ldconfig && \ diff --git a/tools/Makefile b/tools/Makefile index 5f4174e523..bc62b53680 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -26,7 +26,7 @@ tools-y += m4 libtool autoconf automake flex bison pkg-config sed mklibs tools-y += sstrip make-ext4fs e2fsprogs mtd-utils mkimage tools-y += firmware-utils patch-image patch quilt yaffs2 padjffs2 tools-y += mm-macros missing-macros xz cmake scons bc findutils gengetopt patchelf -tools-y += mtools dosfstools +tools-y += mtools dosfstools libressl tools-$(CONFIG_TARGET_orion_generic) += wrt350nv2-builder upslug2 tools-$(CONFIG_powerpc) += upx tools-$(CONFIG_TARGET_x86) += qemu @@ -70,11 +70,9 @@ $(curdir)/findutils/compile := $(curdir)/bison/install $(curdir)/gengetopt/compile := $(curdir)/libtool/install $(curdir)/patchelf/compile := $(curdir)/libtool/install $(curdir)/dosfstools/compile := $(curdir)/autoconf/install $(curdir)/automake/install -ifeq ($(HOST_OS),Darwin) -tools-y += libressl $(curdir)/mkimage/compile += $(curdir)/libressl/install $(curdir)/firmware-utils/compile += $(curdir)/libressl/install -endif + ifneq ($(HOST_OS),Linux) tools-y += coreutils endif |