Permalink
Browse files

OS-2908 platform build does not fail when illumos-extra patches fail …

…to apply
  • Loading branch information...
1 parent 2a2e9d8 commit 33b7b2518a645e1712db10e8bc2f31384df617b5 @wesolows wesolows committed Apr 14, 2014
Showing with 7 additions and 4 deletions.
  1. +7 −4 Makefile.defs
View
@@ -45,6 +45,7 @@ GXX.host.64 = $(GXX.host) -m64
LEX = /opt/local/bin/lex
YACC = /opt/local/bin/yacc
+GPATCH = /opt/local/bin/gpatch
SYSINCDIRS = /usr/include
SYSLIBDIRS = /usr/lib /lib
@@ -135,13 +136,15 @@ FROB_SENTINEL.64 = chmod 755 $(VER.64)/$(UNPACK_SENTINEL)
PATCHSTRIP = 1
APPLY_PATCHES.32 = \
- for p in $(PATCHES); do [ -f "$$p" ] && \
- (cd .unpack32/$(VER) && gpatch -p$(PATCHSTRIP) < "../../$$p"); \
+ for p in $(PATCHES); do \
+ echo "Applying $$p"; \
+ $(GPATCH) -d .unpack32/$(VER) -p$(PATCHSTRIP) < "$$p" || exit 1; \
done
APPLY_PATCHES.64 = \
- for p in $(PATCHES); do [ -f "$$p" ] && \
- (cd .unpack64/$(VER) && gpatch -p$(PATCHSTRIP) < "../../$$p"); \
+ for p in $(PATCHES); do \
+ echo "Applying $$p"; \
+ $(GPATCH) -d .unpack64/$(VER) -p$(PATCHSTRIP) < "$$p" || exit 1; \
done
.DEFAULT_GOAL = all

0 comments on commit 33b7b25

Please sign in to comment.