Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Jul 2013 05:37:42 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r323681 - head/devel/openvex
Message-ID:  <201307260537.r6Q5bgRF094120@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Fri Jul 26 05:37:41 2013
New Revision: 323681
URL: http://svnweb.freebsd.org/changeset/ports/323681

Log:
  Fix parallel builds by sanitizing inner Makefiles and removing possible race
  due to having two targets in ALL_TARGET.  Instead, do the cleaning after the
  build.
  
  Reported by:	pointyhat-west

Modified:
  head/devel/openvex/Makefile

Modified: head/devel/openvex/Makefile
==============================================================================
--- head/devel/openvex/Makefile	Fri Jul 26 05:33:51 2013	(r323680)
+++ head/devel/openvex/Makefile	Fri Jul 26 05:37:41 2013	(r323681)
@@ -18,8 +18,22 @@ RUN_DEPENDS=	vexctl:${PORTSDIR}/devel/ro
 		sdcc:${PORTSDIR}/lang/sdcc \
 		gpasm:${PORTSDIR}/devel/gputils
 
+REINPLACE_ARGS=	-i ""
+
 MAN1=		openvex.1 openvex-new-project.1
 
-ALL_TARGET=	all clean
+post-patch:
+# Use make's -C option to descent into directories and fix parallel builds
+	@${REINPLACE_CMD} -e 's/^all:/& depend/ ; s/ make depend &&//' \
+		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -E 's/cd (.+)(;| &&) make/$$(MAKE) -C \1/' \
+		${WRKSRC}/Advanced/Makefile ${WRKSRC}/Beginner/Makefile \
+		${WRKSRC}/HiBob/Makefile ${WRKSRC}/Makefile
+# Apparently the work around for bug in pic18f8520.h is no longer needed and
+# breaks the build now; disable it for the time being
+	@${REINPLACE_CMD} -e 's/ifdef SDCC/if 0/' ${WRKSRC}/Lib/timer.h
+
+post-build:
+	$(MAKE) -C $(WRKSRC) clean
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307260537.r6Q5bgRF094120>