| Message ID | 20200927210738.21460-1-devel-sven@geroedel.de |
|---|---|
| State | Accepted |
| Delegated to: | Daniel Golle |
| Headers | show |
| Series | build, imagebuilder: Do not require compilers | expand |
On Sun Sep 27, 2020 at 11:07 AM HST, Sven Roederer wrote: > The buildroot and SDK both require the compilers (gcc, g++) to be > installed on the host system, however the ImageBuilder uses precompiled > binaries. > > This patch changes the prerequirements checks to skip the checking for > the compilers if running as ImageBuilder. A similar change has been > made for libncurses-dev in 4a1a58a3e2d2. > > Signed-off-by: Sven Roederer <devel-sven@geroedel.de> Acked-by: Paul Spooren <mail@aparcar.org> > --- > include/prereq-build.mk | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/include/prereq-build.mk b/include/prereq-build.mk > index 4637c6ca50..f67a01299e 100644 > --- a/include/prereq-build.mk > +++ b/include/prereq-build.mk > @@ -26,6 +26,7 @@ $(eval $(call TestHostCommand,proper-umask, \ > Please build with umask 022 - other values produce broken packages, \ > umask | grep -xE 0?0[012][012])) > > +ifndef IB > $(eval $(call SetupHostCommand,gcc, \ > Please install the GNU C Compiler (gcc) 4.8 or later, \ > $(CC) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \ > @@ -37,7 +38,9 @@ $(eval $(call TestHostCommand,working-gcc, \ > it appears to be broken, \ > echo 'int main(int argc, char **argv) { return 0; }' | \ > gcc -x c -o $(TMP_DIR)/a.out -)) > +endif > > +ifndef IB > $(eval $(call SetupHostCommand,g++, \ > Please install the GNU C++ Compiler (g++) 4.8 or later, \ > $(CXX) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \ > @@ -50,6 +53,7 @@ $(eval $(call TestHostCommand,working-g++, \ > echo 'int main(int argc, char **argv) { return 0; }' | \ > g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \ > $(TMP_DIR)/a.out)) > +endif > > ifndef IB > $(eval $(call TestHostCommand,ncurses, \ > -- > 2.20.1 > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Am Dienstag, 29. September 2020, 09:35:20 CEST schrieb Paul Spooren: > On Sun Sep 27, 2020 at 11:07 AM HST, Sven Roederer wrote: > > The buildroot and SDK both require the compilers (gcc, g++) to be > > installed on the host system, however the ImageBuilder uses precompiled > > binaries. > > > > This patch changes the prerequirements checks to skip the checking for > > the compilers if running as ImageBuilder. A similar change has been > > made for libncurses-dev in 4a1a58a3e2d2. > > > > Signed-off-by: Sven Roederer <devel-sven@geroedel.de> > > Acked-by: Paul Spooren <mail@aparcar.org> > Anyone willing to merge? > > --- > > include/prereq-build.mk | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/include/prereq-build.mk b/include/prereq-build.mk > > index 4637c6ca50..f67a01299e 100644 > > --- a/include/prereq-build.mk > > +++ b/include/prereq-build.mk > > @@ -26,6 +26,7 @@ $(eval $(call TestHostCommand,proper-umask, \ > > Please build with umask 022 - other values produce broken packages, \ > > umask | grep -xE 0?0[012][012])) > > > > +ifndef IB > > $(eval $(call SetupHostCommand,gcc, \ > > Please install the GNU C Compiler (gcc) 4.8 or later, \ > > $(CC) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \ > > @@ -37,7 +38,9 @@ $(eval $(call TestHostCommand,working-gcc, \ > > it appears to be broken, \ > > echo 'int main(int argc, char **argv) { return 0; }' | \ > > gcc -x c -o $(TMP_DIR)/a.out -)) > > +endif > > > > +ifndef IB > > $(eval $(call SetupHostCommand,g++, \ > > Please install the GNU C++ Compiler (g++) 4.8 or later, \ > > $(CXX) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \ > > @@ -50,6 +53,7 @@ $(eval $(call TestHostCommand,working-g++, \ > > echo 'int main(int argc, char **argv) { return 0; }' | \ > > g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \ > > $(TMP_DIR)/a.out)) > > +endif > > > > ifndef IB > > $(eval $(call TestHostCommand,ncurses, \ > > -- > > 2.20.1 > > > > > > _______________________________________________ > > openwrt-devel mailing list > > openwrt-devel@lists.openwrt.org > > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 4637c6ca50..f67a01299e 100644 --- a/include/prereq-build.mk +++ b/include/prereq-build.mk @@ -26,6 +26,7 @@ $(eval $(call TestHostCommand,proper-umask, \ Please build with umask 022 - other values produce broken packages, \ umask | grep -xE 0?0[012][012])) +ifndef IB $(eval $(call SetupHostCommand,gcc, \ Please install the GNU C Compiler (gcc) 4.8 or later, \ $(CC) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \ @@ -37,7 +38,9 @@ $(eval $(call TestHostCommand,working-gcc, \ it appears to be broken, \ echo 'int main(int argc, char **argv) { return 0; }' | \ gcc -x c -o $(TMP_DIR)/a.out -)) +endif +ifndef IB $(eval $(call SetupHostCommand,g++, \ Please install the GNU C++ Compiler (g++) 4.8 or later, \ $(CXX) -dumpversion | grep -E '^(4\.[8-9]|[5-9]\.?|10\.?)', \ @@ -50,6 +53,7 @@ $(eval $(call TestHostCommand,working-g++, \ echo 'int main(int argc, char **argv) { return 0; }' | \ g++ -x c++ -o $(TMP_DIR)/a.out - -lstdc++ && \ $(TMP_DIR)/a.out)) +endif ifndef IB $(eval $(call TestHostCommand,ncurses, \
The buildroot and SDK both require the compilers (gcc, g++) to be installed on the host system, however the ImageBuilder uses precompiled binaries. This patch changes the prerequirements checks to skip the checking for the compilers if running as ImageBuilder. A similar change has been made for libncurses-dev in 4a1a58a3e2d2. Signed-off-by: Sven Roederer <devel-sven@geroedel.de> --- include/prereq-build.mk | 4 ++++ 1 file changed, 4 insertions(+)