[PATCH] build/prereq: merge ifndef IB block together

[Paul Spooren]

On Mi, Dez 30, 2020 at 18:10, Paul Spooren <mail at aparcar.org> wrote:
> 
> 
> On Mi, Dez 30, 2020 at 18:28, Baptiste Jonglez 
> <baptiste at bitsofnetworks.org> wrote:
>> Hi,
>> 
>> On 29-12-20, Paul Spooren wrote:
>>>  Multiple prereq checks are only required within the build system 
>>> but not
>>>  for the ImageBuilder. These checks are excluded by using ifndef IB.
>>> 
>>>  This commit merges the three ifndef IB blocks together.
>> 
>> To clarify, this is only cosmetic, right?
> 
> Yes
> 
>> 
>> I just saw the last changes that avoid requiring build dependencies 
>> for
>> the imagebuilder, this is good news.  It makes sense to backport them
>> (4a1a58a3e2d236 & ae12a747cae3d & this one) for openwrt-19.07.
> 
> True, I'll do that.

Merged and backported.

> 
>> 
>> Thanks,
>> Baptiste
>> 
>>>  diff --git a/include/prereq-build.mk b/include/prereq-build.mk
>>>  index ad204e95e8..3a51c4cd70 100644
>>>  --- a/include/prereq-build.mk
>>>  +++ b/include/prereq-build.mk
>>>  @@ -38,9 +38,7 @@ $(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\.?)', \
>>>  @@ -53,14 +51,12 @@ $(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, \
>>>   	Please install ncurses. (Missing libncurses.so or ncurses.h), \
>>>   	echo 'int main(int argc, char **argv) { initscr(); return 0; }' 
>>> | \
>>>   		gcc -include ncurses.h -x c -o $(TMP_DIR)/a.out - -lncurses))
>>>  -endif
>>>  +endif # IB
>>> 
>>>   ifeq ($(HOST_OS),Linux)
>>>     zlib_link_flags := -Wl,-Bstatic -lz -Wl,-Bdynamic
>