Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 31 Jul 2013 07:43:53 +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: r324014 - in head/graphics/volpack: . files
Message-ID:  <201307310743.r6V7hrA1063035@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Wed Jul 31 07:43:53 2013
New Revision: 324014
URL: http://svnweb.freebsd.org/changeset/ports/324014

Log:
  Try to properly fix parallel builds instead of marking port as -jX unsafe.

Modified:
  head/graphics/volpack/Makefile
  head/graphics/volpack/files/patch-Makefile.in

Modified: head/graphics/volpack/Makefile
==============================================================================
--- head/graphics/volpack/Makefile	Wed Jul 31 07:25:25 2013	(r324013)
+++ head/graphics/volpack/Makefile	Wed Jul 31 07:43:53 2013	(r324014)
@@ -13,7 +13,6 @@ COMMENT=	Portable software library for v
 LICENSE=	BSD
 
 GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	lib/libvolpack.a \
 		include/volpack.h

Modified: head/graphics/volpack/files/patch-Makefile.in
==============================================================================
--- head/graphics/volpack/files/patch-Makefile.in	Wed Jul 31 07:25:25 2013	(r324013)
+++ head/graphics/volpack/files/patch-Makefile.in	Wed Jul 31 07:43:53 2013	(r324014)
@@ -1,6 +1,6 @@
 --- Makefile.in.orig	1994-12-12 21:21:47.000000000 +0100
-+++ Makefile.in	2012-06-05 13:26:24.552254340 +0200
-@@ -175,7 +175,7 @@
++++ Makefile.in	2013-07-31 15:38:51.000000000 +0800
+@@ -175,25 +175,13 @@
  	cc -o makeopts makeopts.c
  
  vp_opts.c: makeopts Makefile
@@ -8,8 +8,28 @@
 +	./makeopts vp_opts.c $(CFLAGS)
  
  $(COMP_SRCS): $(COMP_IN)
- 	@for i in $(COMP_SRCS) ; \
-@@ -239,10 +239,9 @@
+-	@for i in $(COMP_SRCS) ; \
+-	    do \
+-		rm -f $$i ;\
+-		echo "$(M4) -DSourceFile=$$i $(COMP_IN) > $$i" ;\
+-		$(M4) -DSourceFile=$$i $(COMP_IN) > $$i; \
+-		chmod -w $$i; \
+-	    done
++	$(M4) -DSourceFile=$@ $(COMP_IN) > $@ && chmod -w $@
+ 
+ $(WARP_SRCS): $(WARP_IN)
+-	@for i in $(WARP_SRCS) ; \
+-	    do \
+-		rm -f $$i ;\
+-		echo "$(M4) -DSourceFile=$$i $(WARP_IN) > $$i" ;\
+-		$(M4) -DSourceFile=$$i $(WARP_IN) > $$i; \
+-		chmod -w $$i; \
+-	    done
++	$(M4) -DSourceFile=$@ $(WARP_IN) > $@ && chmod -w $@
+ 
+ examples: libvolpack.a
+ 	cd examples; make
+@@ -239,10 +227,9 @@
  	    done;
  	@cd $(SRC_DIR)/man/src; for i in *.3; \
  	    do \



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