X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=include%2Fprereq-build.mk;h=b7ada69bb418ba51c3cedbc05f277a5fffb637c5;hp=74f1e32a6ed7daf8f5fc71a51a854b7669598d5f;hb=32301bfd08a2edca56418784ed95e81905808edd;hpb=6c85e21f3df469e6ce25478cdd34d31960a427cd

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 74f1e32a6e..b7ada69bb4 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -8,6 +8,7 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/host.mk
+include $(INCLUDE_DIR)/host-build.mk
 
 PKG_NAME:=Build dependency
 
@@ -38,6 +39,8 @@ $(eval $(call Require,case-sensitive-fs, \
 ))
 
 define Require/getopt
+	gnugetopt --help 2>&1 | grep long >/dev/null || \
+	/usr/local/bin/getopt --help 2>&1 | grep long >/dev/null || \
 	getopt --help 2>&1 | grep long >/dev/null
 endef
 $(eval $(call Require,getopt, \
@@ -70,24 +73,26 @@ $(eval $(call Require,working-g++, \
 	Please install the GNU C++ Compiler (g++). \
 ))
 
-define Require/working-gcc-static
+ifneq ($(HOST_STATIC_LINKING),)
+  define Require/working-gcc-static
 	echo 'int main(int argc, char **argv) { return 0; }' | \
-		gcc -x c -static -o $(TMP_DIR)/a.out -
-endef
+		gcc -x c $(HOST_STATIC_LINKING) -o $(TMP_DIR)/a.out -
+  endef
 
-$(eval $(call Require,working-gcc-static, \
+  $(eval $(call Require,working-gcc-static, \
     Please install the static libc development package (glibc-static on CentOS/Fedora/RHEL). \
-))
+  ))
 
-define Require/working-g++-static
+  define Require/working-g++-static
 	echo 'int main(int argc, char **argv) { return 0; }' | \
-		g++ -x c++ -static -o $(TMP_DIR)/a.out - -lstdc++ && \
+		g++ -x c++ $(HOST_STATIC_LINKING) -o $(TMP_DIR)/a.out - -lstdc++ && \
 		$(TMP_DIR)/a.out
-endef
+  endef
 
-$(eval $(call Require,working-g++-static, \
+  $(eval $(call Require,working-g++-static, \
 	Please install the static libstdc++ development package (libstdc++-static on CentOS/Fedora/RHEL). \
-))
+  ))
+endif
 
 define Require/ncurses
 	echo 'int main(int argc, char **argv) { initscr(); return 0; }' | \
@@ -108,14 +113,16 @@ $(eval $(call Require,zlib, \
 	Please install zlib. (Missing libz.so or zlib.h) \
 ))
 
-define Require/zlib-static
+ifneq ($(HOST_STATIC_LINKING),)
+  define Require/zlib-static
 	echo 'int main(int argc, char **argv) { gzdopen(0, "rb"); return 0; }' | \
-		gcc -include zlib.h -x c -static -o $(TMP_DIR)/a.out - -lz
-endef
+		gcc -include zlib.h -x c $(HOST_STATIC_LINKING) -o $(TMP_DIR)/a.out - -lz
+  endef
 
-$(eval $(call Require,zlib-static, \
+  $(eval $(call Require,zlib-static, \
 	Please install a static zlib. (zlib-static on CentOS/Fedora/RHEL). \
-))
+  ))
+endif
 
 $(eval $(call RequireCommand,gawk, \
 	Please install GNU awk. \
@@ -129,15 +136,11 @@ $(eval $(call RequireCommand,bzip2, \
 	Please install bzip2. \
 ))
 
-$(eval $(call RequireCommand,patch, \
-	Please install patch. \
-))
-
 $(eval $(call RequireCommand,perl, \
 	Please install perl. \
 ))
 
-$(eval $(call RequireCommand,python, \
+$(eval $(call RequireCommand,$(PYTHON), \
 	Please install python. \
 ))
 
@@ -165,6 +168,10 @@ $(eval $(call RequireCommand,svn, \
 	Please install the subversion client. \
 ))
 
+$(eval $(call RequireCommand,openssl, \
+	Please install openssl. \
+))
+
 define Require/gnu-find
 	$(FIND) --version 2>/dev/null
 endef