include: fix prereq tests for perl and file (#18911)

[librecmc/librecmc.git] / include / prereq-build.mk

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 306a6b3e38bd5855579c3f19cf2bca0cb7e35dff..926a06f8ba4130f5dcafc6bc0166368bff04dc6c 100644 (file)
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -68,24 +68,6 @@ $(eval $(call TestHostCommand,libssl, \
        echo 'int main(int argc, char **argv) { SSL_library_init(); return 0; }' | \
                gcc -include openssl/ssl.h -x c -o $(TMP_DIR)/a.out - -lcrypto -lssl))
 
-ifneq ($(HOST_STATIC_LINKING),)
-  $(eval $(call TestHostCommand,working-gcc-static, \
-       Please install the static libc development package (glibc-static on CentOS/Fedora/RHEL)., \
-       echo 'int main(int argc, char **argv) { return 0; }' | \
-               gcc -x c $(HOST_STATIC_LINKING) -o $(TMP_DIR)/a.out -))
-
-  $(eval $(call TestHostCommand,working-g++-static, \
-       Please install the static libstdc++ development package (libstdc++-static on CentOS/Fedora/RHEL)., \
-       echo 'int main(int argc, char **argv) { return 0; }' | \
-               g++ -x c++ $(HOST_STATIC_LINKING) -o $(TMP_DIR)/a.out - -lstdc++ && \
-               $(TMP_DIR)/a.out))
-
-  $(eval $(call TestHostCommand,zlib-static, \
-       Please install a static zlib. (zlib-static on CentOS/Fedora/RHEL)., \
-       echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \
-               gcc -include zlib.h -x c $(HOST_STATIC_LINKING) -o $(TMP_DIR)/a.out - -lz))
-endif
-
 
 $(eval $(call SetupHostCommand,tar,Please install GNU 'tar', \
        gtar --version 2>&1 | grep GNU, \
@@ -150,7 +132,7 @@ $(eval $(call SetupHostCommand,wget,Please install GNU 'wget', \
        wget --version | grep GNU))
 
 $(eval $(call SetupHostCommand,perl,Please install Perl 5.x, \
-       perl --version | grep "perl 5"))
+       perl --version | grep "perl.*v5"))
 
 $(eval $(call SetupHostCommand,python,Please install Python 2.x, \
        python2.7 -V 2>&1 | grep Python, \
@@ -161,10 +143,10 @@ $(eval $(call SetupHostCommand,svn,Please install the Subversion client, \
        svn --version | grep Subversion))
 
 $(eval $(call SetupHostCommand,git,Please install Git (git-core) >= 1.6.5, \
-       git clone --help | grep -- --recursive))
+       git clone 2>&1 | grep -- --recursive))
 
 $(eval $(call SetupHostCommand,file,Please install the 'file' package, \
-       file --version | grep file))
+       file --version 2>&1 | grep file))
 
 $(eval $(call SetupHostCommand,openssl,Please install the 'openssl' utility, \
        openssl version | grep OpenSSL))