improve support for building on mac os x by improving detection of missing components
SVN-Revision: 14180
This commit is contained in:
		| @@ -37,6 +37,20 @@ $(eval $(call Require,case-sensitive-fs, \ | |||||||
| 	OpenWrt can only be built on a case-sensitive filesystem \ | 	OpenWrt can only be built on a case-sensitive filesystem \ | ||||||
| )) | )) | ||||||
|  |  | ||||||
|  | define Require/getopt | ||||||
|  | 	getopt --help 2>&1 | grep long >/dev/null | ||||||
|  | endef | ||||||
|  | $(eval $(call Require,getopt, \ | ||||||
|  | 	Please install GNU getopt \ | ||||||
|  | )) | ||||||
|  |  | ||||||
|  | define Require/fileutils | ||||||
|  | 	gcp --help || cp --help | ||||||
|  | endef | ||||||
|  | $(eval $(call Require,fileutils, \ | ||||||
|  | 	Please install GNU fileutils \ | ||||||
|  | )) | ||||||
|  |  | ||||||
| define Require/working-gcc | define Require/working-gcc | ||||||
| 	echo 'int main(int argc, char **argv) { return 0; }' | \ | 	echo 'int main(int argc, char **argv) { return 0; }' | \ | ||||||
| 		gcc -x c -o $(TMP_DIR)/a.out - | 		gcc -x c -o $(TMP_DIR)/a.out - | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								scripts/md5sum
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										2
									
								
								scripts/md5sum
									
									
									
									
									
										Executable file
									
								
							| @@ -0,0 +1,2 @@ | |||||||
|  | #!/bin/sh | ||||||
|  | cat "$@" | md5 | ||||||
| @@ -27,23 +27,20 @@ $(STAGING_DIR)/.prepared: $(TMP_DIR)/.build | |||||||
| 	$(INSTALL_DATA) $(TOPDIR)/tools/include/*.h $(STAGING_DIR_HOST)/include/ | 	$(INSTALL_DATA) $(TOPDIR)/tools/include/*.h $(STAGING_DIR_HOST)/include/ | ||||||
| 	touch $@ | 	touch $@ | ||||||
|  |  | ||||||
| $(STAGING_DIR_HOST)/bin/md5sum: $(STAGING_DIR)/.prepared | define PrepareCommand | ||||||
| 	@MD5SUM=`which md5sum 2>/dev/null`; \ | $(STAGING_DIR_HOST)/bin/$(1): $(STAGING_DIR)/.prepared | ||||||
| 	if [ "$@" != "$$MD5SUM" ]; then \ | 	@mkdir -p "$$(dir $$@)"; rm -f "$$@" | ||||||
| 		if [ -x "$$MD5SUM" ]; then \ | 	@export FILE="$$$$(which $(2) 2>/dev/null | grep -v 'not found' | head -n1)"; [ -n "$$$$FILE" ] || { \ | ||||||
| 			ln -sf "$$MD5SUM" "$@"; \ | 		echo "Command $(1) not found."; false; \ | ||||||
| 		else \ | 	}; ln -s "$$$$FILE" "$$@" | ||||||
| 			cp $(SCRIPT_DIR)/md5sum $(STAGING_DIR_HOST)/bin/; \ |  | ||||||
| 		fi; \ |  | ||||||
| 	fi |  | ||||||
|  |  | ||||||
| $(STAGING_DIR_HOST)/bin/find: $(STAGING_DIR)/.prepared | endef | ||||||
| 	if [ -x "$(FIND)" -a "$(FIND)" != "$@" ]; then \ |  | ||||||
| 		ln -sf "$(FIND)" $@; \ |  | ||||||
| 	fi |  | ||||||
|  |  | ||||||
|  | $(eval $(call PrepareCommand,find,gfind find)) | ||||||
|  | $(eval $(call PrepareCommand,md5sum,md5sum $(SCRIPT_DIR)/md5sum)) | ||||||
|  | $(eval $(call PrepareCommand,cp,gcp cp)) | ||||||
|  |  | ||||||
| $(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,find md5sum) | $(curdir)/cmddeps = $(patsubst %,$(STAGING_DIR_HOST)/bin/%,find md5sum cp) | ||||||
| $(curdir)//prepare = $(STAGING_DIR)/.prepared $($(curdir)/cmddeps) | $(curdir)//prepare = $(STAGING_DIR)/.prepared $($(curdir)/cmddeps) | ||||||
| $(curdir)//compile = $(STAGING_DIR)/.prepared $($(curdir)/cmddeps) | $(curdir)//compile = $(STAGING_DIR)/.prepared $($(curdir)/cmddeps) | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Felix Fietkau
					Felix Fietkau