newt: avoid poisoned paths
PATCH 1/1 newt: avoid poisoned paths
Fixes http://autobuild.buildroot.net/results/cb908f73b14e1510bea890167b3927afbf708d6f/
Signed-off-by Alex Suykov <[email protected]>
---
newt-fix-makefile.patch renamed to 0001-newt-fix-makefile.patch
package/newt/0001-newt-fix-makefile.patch | 35 +++++++++++++++++++++++++++++++ package/newt/0002-slang-include-dir.patch | 15 +++++++++++++ package/newt/newt-fix-makefile.patch | 35 ------------------------------- 3 files changed, 50 insertions(+), 35 deletions(-) create mode 100644 package/newt/0001-newt-fix-makefile.patch create mode 100644 package/newt/0002-slang-include-dir.patch delete mode 100644 package/newt/newt-fix-makefile.patch
package/newt/0001-newt-fix-makefile.patch new file +35 -0
@@ -0,0 +1,35 @@ +Fix Makefile.in + +* Use $(CC) instead of $(CPP) to generate .depend file because + '$(CPP) -M' call does not support multiple input files. + This avoid the following error: + +make[1]: Entering directory `/opt/br/output/build/newt-0.51.0' +/opt/br/output/host/usr/bin/arm-none-linux-gnueabi-cpp -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -M newt.c button.c form.c checkbox.c entry.c label.c listbox.c scrollbar.c textbox.c scale.c grid.c windows.c buttonbar.c checkboxtree.c > .depend +arm-none-linux-gnueabi-cpp: too many input files +make[1]: *** [depend] Error 1 +make[1]: Leaving directory +`/opt/br/output/build/newt-0.51.0' +make: *** +[/opt/br/output/build/newt-0.51.0/.stamp_built] Error 2 + +Signed-off-by: Samuel Martin <[email protected]> +Signed-off-by: Yegor Yefremov <[email protected]> + +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: b/Makefile.in +=================================================================== +--- a/Makefile.in ++++ b/Makefile.in +@@ -121,7 +121,7 @@ + $(SHAREDDIR)/*.o *.$(SOEXT)* + + depend: +- $(CPP) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend ++ $(CC) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend + + $(SHAREDDIR): + mkdir -p $(SHAREDDIR)
package/newt/0002-slang-include-dir.patch new file +15 -0
@@ -0,0 +1,15 @@ +slang.h is in sysroot/usr/include, no need to use -I + +Signed-off-by: Alex Suykov <[email protected]> + +--- a/Makefile.in ++++ b/Makefile.in +@@ -5,7 +5,7 @@ + CPP = @CPP@ + CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ +-CPPFLAGS = -D_GNU_SOURCE -I/usr/include/slang @CPPFLAGS@ ++CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ + GNU_LD = @GNU_LD@ + + VERSION = @VERSION@
package/newt/newt-fix-makefile.patch deleted +0 -35
@@ -1,35 +0,0 @@ -Fix Makefile.in - -* Use $(CC) instead of $(CPP) to generate .depend file because - '$(CPP) -M' call does not support multiple input files. - This avoid the following error: - -make[1]: Entering directory `/opt/br/output/build/newt-0.51.0' -/opt/br/output/host/usr/bin/arm-none-linux-gnueabi-cpp -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -M newt.c button.c form.c checkbox.c entry.c label.c listbox.c scrollbar.c textbox.c scale.c grid.c windows.c buttonbar.c checkboxtree.c > .depend -arm-none-linux-gnueabi-cpp: too many input files -make[1]: *** [depend] Error 1 -make[1]: Leaving directory -`/opt/br/output/build/newt-0.51.0' -make: *** -[/opt/br/output/build/newt-0.51.0/.stamp_built] Error 2 - -Signed-off-by: Samuel Martin <[email protected]> -Signed-off-by: Yegor Yefremov <[email protected]> - ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: b/Makefile.in -=================================================================== ---- a/Makefile.in -+++ b/Makefile.in -@@ -121,7 +121,7 @@ - $(SHAREDDIR)/*.o *.$(SOEXT)* - - depend: -- $(CPP) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend -+ $(CC) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend - - $(SHAREDDIR): - mkdir -p $(SHAREDDIR)
Signature · 1 line
2.0.3
Thomas Petazzoni
AppliedPATCH 1/1 newt: avoid poisoned paths
Dear Alex Suykov,
Quoted 3 lines · Alex Suykov
Fixes http://autobuild.buildroot.net/results/cb908f73b14e1510bea890167b3927afbf708d6f/
Signed-off-by Alex Suykov <[email protected]>
Thanks, applied, even though I would have preferred to see two patches:
one renaming the existing patch, one adding the new patch.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com