domenico/openwrt-R7800-nss
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prereq: prefer existing built coreutils as symlink target

Browse Source 
For the utilities provided by coreutils
but required before coreutils is built,
if coreutils is actually built already, prefer a symlink to
the built versions instead of the host machine's version.

Tested-by: Georgi Valkov <gvalkov@gmail.com> # macOS
Signed-off-by: Michael Pratt <mcpratt@pm.me>
Link: https://github.com/openwrt/openwrt/pull/16522
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Michael Pratt
2024-10-03 00:57:29 -04:00
committed by Robert Marko
parent 660e398f92
commit f197b5827a
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/prereq-build.mk
View File

@@ -126,10 +126,12 @@ $(eval $(call SetupHostCommand,diff,Please install GNU diffutils, \
diff --version 2>&1 | grep GNU)) diff --version 2>&1 | grep GNU))
$(eval $(call SetupHostCommand,cp,Please install GNU fileutils, \ $(eval $(call SetupHostCommand,cp,Please install GNU fileutils, \
$(TOPDIR)/staging_dir/host/bin/gcp --help 2>&1 | grep 'Copy SOURCE', \
gcp --help 2>&1 | grep 'Copy SOURCE', \ gcp --help 2>&1 | grep 'Copy SOURCE', \
cp --help 2>&1 | grep 'Copy SOURCE')) cp --help 2>&1 | grep 'Copy SOURCE'))
$(eval $(call SetupHostCommand,seq,Please install seq, \ $(eval $(call SetupHostCommand,seq,Please install seq, \
$(TOPDIR)/staging_dir/host/bin/gseq --version, \
gseq --version, \ gseq --version, \
seq --version 2>&1 | grep seq)) seq --version 2>&1 | grep seq))
@@ -153,10 +155,12 @@ $(eval $(call SetupHostCommand,getopt, \
/opt/local/bin/getopt -o t --long test -- --test | grep '^ *--test *--')) /opt/local/bin/getopt -o t --long test -- --test | grep '^ *--test *--'))
$(eval $(call SetupHostCommand,realpath,Please install a 'realpath' utility, \ $(eval $(call SetupHostCommand,realpath,Please install a 'realpath' utility, \
$(TOPDIR)/staging_dir/host/bin/grealpath /, \
grealpath /, \ grealpath /, \
realpath /)) realpath /))
$(eval $(call SetupHostCommand,stat,Cannot find a file stat utility, \ $(eval $(call SetupHostCommand,stat,Cannot find a file stat utility, \
$(TOPDIR)/staging_dir/host/bin/gstat -c%s $(TOPDIR)/Makefile, \
gnustat -c%s $(TOPDIR)/Makefile, \ gnustat -c%s $(TOPDIR)/Makefile, \
gstat -c%s $(TOPDIR)/Makefile, \ gstat -c%s $(TOPDIR)/Makefile, \
stat -c%s $(TOPDIR)/Makefile)) stat -c%s $(TOPDIR)/Makefile))
@@ -175,6 +179,7 @@ $(eval $(call SetupHostCommand,wget,Please install GNU 'wget', \
wget --version | grep GNU)) wget --version | grep GNU))
$(eval $(call SetupHostCommand,install,Please install GNU 'install', \ $(eval $(call SetupHostCommand,install,Please install GNU 'install', \
$(TOPDIR)/staging_dir/host/bin/ginstall --version | grep GNU, \
install --version | grep GNU, \ install --version | grep GNU, \
ginstall --version | grep GNU)) ginstall --version | grep GNU))