diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2010-05-21 21:09:34 +0200 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-05-21 21:09:34 +0200 |
commit | 73d2cbbd1b9b9674e679a25bfa96e7c8848436a0 (patch) | |
tree | 455683cd9ae33dd50ac16524b580a5860ce10658 /package/fltk/fltk-1.1.7-bail-out-on-error.patch | |
parent | 62c3e55dc91db08269272f33698e8b9902d160de (diff) | |
parent | 584921cb87b66f6c2dd8d080593137ed64a529d0 (diff) |
Merge branch 'fltk-fix-bug-1729' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/fltk/fltk-1.1.7-bail-out-on-error.patch')
-rw-r--r-- | package/fltk/fltk-1.1.7-bail-out-on-error.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/package/fltk/fltk-1.1.7-bail-out-on-error.patch b/package/fltk/fltk-1.1.7-bail-out-on-error.patch new file mode 100644 index 000000000..644a0560b --- /dev/null +++ b/package/fltk/fltk-1.1.7-bail-out-on-error.patch @@ -0,0 +1,54 @@ +When a submake fails, the build of FLTK was stopping, but the main +make was returning 0. Therefore, Buildroot was going on with the build +of the other components, even though the build of FLTK failed. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: fltk-1.1.7/Makefile +=================================================================== +--- fltk-1.1.7.orig/Makefile 2010-05-21 15:52:20.000000000 +0200 ++++ fltk-1.1.7/Makefile 2010-05-21 15:52:43.000000000 +0200 +@@ -32,7 +32,7 @@ + all: makeinclude + for dir in $(DIRS); do\ + echo "=== making $$dir ===";\ +- (cd $$dir; $(MAKE) $(MFLAGS)) || break;\ ++ (cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\ + done + + install: makeinclude +@@ -42,7 +42,7 @@ + -chmod 755 $(DESTDIR)$(bindir)/fltk-config + for dir in FL $(DIRS); do\ + echo "=== installing $$dir ===";\ +- (cd $$dir; $(MAKE) $(MFLAGS) install) || break;\ ++ (cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\ + done + + install-desktop: makeinclude +@@ -54,7 +54,7 @@ + $(RM) $(DESTDIR)$(bindir)/fltk-config + for dir in FL $(DIRS); do\ + echo "=== uninstalling $$dir ===";\ +- (cd $$dir; $(MAKE) $(MFLAGS) uninstall) || break;\ ++ (cd $$dir; $(MAKE) $(MFLAGS) uninstall) || exit 1;\ + done + + uninstall-desktop: makeinclude +@@ -65,14 +65,14 @@ + depend: makeinclude + for dir in $(DIRS); do\ + echo "=== making dependencies in $$dir ===";\ +- (cd $$dir; $(MAKE) $(MFLAGS) depend) || break;\ ++ (cd $$dir; $(MAKE) $(MFLAGS) depend) || exit 1;\ + done + + clean: + -$(RM) core *.o + for dir in $(DIRS); do\ + echo "=== cleaning $$dir ===";\ +- (cd $$dir; $(MAKE) $(MFLAGS) clean) || break;\ ++ (cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\ + done + + distclean: clean |