Files
pkgsrc-ng/devel/sdcc3/patches/patch-Makefile_in
2016-11-18 22:39:22 +01:00

100 lines
2.9 KiB
Plaintext

$NetBSD: patch-Makefile_in,v 1.2 2016/06/25 17:48:15 bouyer Exp $
* Make the makefile stop on error.
* Build sdcpp in earlier stage.
--- Makefile.in.orig 2016-05-15 13:34:37.000000000 +0200
+++ Makefile.in 2016-06-25 13:15:26.000000000 +0200
@@ -120,19 +120,19 @@
tini: checkconf sdcc-tini
sdcc-libs: sdcc-sdbinutils
- for lib in $(SDCC_LIBS); do $(MAKE) -C $$lib; done
+ for lib in $(SDCC_LIBS); do $(MAKE) -C $$lib || exit 1; done
sdcc-cc: sdcc-libs
$(MAKE) -C src
sdcc-as:
- for as in $(SDCC_AS); do $(MAKE) -C $$as ; done
+ for as in $(SDCC_AS); do $(MAKE) -C $$as || exit 1 ; done
sdcc-ld:
$(MAKE) -C sdas/linksrc $(SDCC_LD)
sdcc-misc:
- for misc in $(SDCC_MISC); do $(MAKE) -C $$misc ; done
+ for misc in $(SDCC_MISC); do $(MAKE) -C $$misc || exit 1 ; done
sdcc-scripts:
$(MAKE) -C $(SDCC_SCRIPTS)
@@ -192,7 +192,7 @@
install: checkconf sdcc
$(MAKE) -f main.mk install
@for pkg in $(PKGS); do\
- $(MAKE) -C $$pkg install ;\
+ $(MAKE) -C $$pkg install || exit 1;\
done
# Deleting all the installed files
@@ -200,7 +200,7 @@
uninstall:
$(MAKE) -f main.mk uninstall
@for pkg in $(PKGS); do\
- $(MAKE) -C $$pkg uninstall ;\
+ $(MAKE) -C $$pkg uninstall || exit 1;\
done
# Deleting all files created by building the program
@@ -210,7 +210,7 @@
$(MAKE) -f $(srcdir)/clean.mk clean
@echo "+ Cleaning packages in their directories..."
for pkg in $(PKGS); do\
- $(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) clean ;\
+ $(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) clean || exit 1;\
done
# Deleting all files created by configuring or building the program
@@ -218,10 +218,10 @@
distclean:
@echo "+ DistCleaning packages using clean.mk..."
for pkg in $(PKGS); do\
- $(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) distclean ;\
+ $(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) distclean || exit 1;\
done
for pkg in $(SDCC_EXTRA); do \
- $(MAKE) -C $$pkg distclean; \
+ $(MAKE) -C $$pkg distclean || exit 1; \
done
@echo "+ DistCleaning root of the project..."
$(MAKE) -f $(srcdir)/clean.mk distclean
@@ -231,7 +231,7 @@
mostlyclean: clean
$(MAKE) -f $(srcdir)/clean.mk mostlyclean
for pkg in $(PKGS); do\
- $(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) mostlyclean ;\
+ $(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) mostlyclean || exit 1;\
done
# Deleting everything that can reconstructed by this Makefile. It deletes
@@ -240,7 +240,7 @@
realclean: distclean
$(MAKE) -f $(srcdir)/clean.mk realclean
for pkg in $(PKGS); do\
- $(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) realclean ;\
+ $(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) realclean || exit 1;\
done
# Creating distribution
@@ -264,8 +264,9 @@
# ---------------------
dep: $(SDCC_LIBS)
$(MAKE) -f main.mk dep
+ ${MAKE} -C support/cpp dep
@for pkg in $(PKGS); do\
- $(MAKE) -C $$pkg dep ;\
+ $(MAKE) -C $$pkg dep || exit 1;\
done
# My rules