X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=include%2Fprereq-build.mk;h=af4e8b5e14640af95a136c1abcf36c653f7c2214;hp=ed652ca9a729a6bd8e9222012e9ef65bea04bd21;hb=7faee1bc9f9ede0e23de19d6156dc8d769431bb3;hpb=b81fc29123f777f61d99c59c214a69e253cb2cc0 diff --git a/include/prereq-build.mk b/include/prereq-build.mk index ed652ca9a7..af4e8b5e14 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)) @@ -135,11 +127,6 @@ $(eval $(call SetupHostCommand,stat,Cannot find a file stat utility, \ gstat -c%s $(TMP_DIR)/.host.mk, \ stat -c%s $(TMP_DIR)/.host.mk)) -$(eval $(call SetupHostCommand,md5sum,, \ - gmd5sum /dev/null | grep d41d8cd98f00b204e9800998ecf8427e, \ - md5sum /dev/null | grep d41d8cd98f00b204e9800998ecf8427e, \ - $(SCRIPT_DIR)/md5sum /dev/null | grep d41d8cd98f00b204e9800998ecf8427e)) - $(eval $(call SetupHostCommand,unzip,Please install 'unzip', \ unzip 2>&1 | grep zipfile, \ unzip)) @@ -164,11 +151,11 @@ $(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 +$(STAGING_DIR_HOST)/bin/mkhash: $(SCRIPT_DIR)/mkhash.c + mkdir -p $(dir $@) + $(CC) -O2 -I$(TOPDIR)/tools/include -o $@ $< +prereq: $(STAGING_DIR_HOST)/bin/mkhash # Install ldconfig stub $(eval $(call TestHostCommand,ldconfig-stub,Failed to install stub, \