Revision
148841
Author
dstrubbe@macports.org
Date
2016-05-19 14:27:01 -0700 (Thu, 19 May 2016)

Log Message

quantum-espresso: Another patch to ensure parallel build in PHonon.

Modified Paths

Diff

Modified: trunk/dports/science/quantum-espresso/files/patch-Makefile.diff (148840 => 148841)


--- trunk/dports/science/quantum-espresso/files/patch-Makefile.diff	2016-05-19 21:18:03 UTC (rev 148840)
+++ trunk/dports/science/quantum-espresso/files/patch-Makefile.diff	2016-05-19 21:27:01 UTC (rev 148841)
@@ -1,5 +1,5 @@
---- Makefile.orig	2016-05-04 11:44:44.000000000 -0400
-+++ Makefile	2016-05-04 11:45:33.000000000 -0400
+--- Makefile.orig	2016-05-19 15:15:27.000000000 -0400
++++ Makefile	2016-05-19 15:26:25.000000000 -0400
 @@ -62,6 +62,9 @@
  # If "|| exit 1" is not present, the error code from make in subdirectories
  # is not returned and make goes on even if compilation has failed
@@ -10,12 +10,17 @@
  pw : bindir libfft libla mods liblapack libblas libs libiotk 
  	if test -d PW ; then \
  	( cd PW ; $(MAKE) TLDEPS= all || exit 1) ; fi
-@@ -78,7 +81,7 @@
+@@ -78,8 +81,11 @@
  	if test -d CPV ; then \
  	( cd CPV ; $(MAKE) TLDEPS= all || exit 1) ; fi
  
 -ph : bindir libfft libla mods libs pw 
+-	( cd install ; $(MAKE) -f plugins_makefile phonon || exit 1 )
 +ph : bindir libfft libla mods libs pw lr-lib 
- 	( cd install ; $(MAKE) -f plugins_makefile phonon || exit 1 )
++	( cd PHonon/PH ; $(MAKE) all ; cd .. || exit 1 )
++	( cd PHonon/Gamma ; $(MAKE) all ; cd .. || exit 1 )
++	( cd PHonon/D3 ; $(MAKE) all ; cd .. || exit 1 )
++	( cd PHonon/FD ; $(MAKE) all ; cd .. || exit 1 )
  
  neb : bindir libfft libla mods libs pw
+ 	( cd install ; $(MAKE) -f plugins_makefile $@ || exit 1 )