[gentoo-commits] gentoo-x86 commit in sci-chemistry/ccpn/files: 2.2.1-parallel.patch xeasy2azara

[Justin Lecher (jlec)]

jlec        11/02/22 10:35:38

  Added:                2.2.1-parallel.patch xeasy2azara
  Log:
  Version Bump and python patches
  
  (Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-chemistry/ccpn/files/2.2.1-parallel.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccpn/files/2.2.1-parallel.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccpn/files/2.2.1-parallel.patch?rev=1.1&content-type=text/plain

Index: 2.2.1-parallel.patch
===================================================================
diff --git a/ccpnmr2.2/c/Makefile b/ccpnmr2.2/c/Makefile
index 01fb25a..8e8e1fe 100644
--- a/ccpnmr2.2/c/Makefile
+++ b/ccpnmr2.2/c/Makefile
@@ -5,22 +5,22 @@ all: compile
 compile: global structure analysis clouds dynamics bayes
 
 global:
-	cd memops/global && $(MAKE)
+	$(MAKE) -C memops/global
 
-structure:
-	cd ccp/structure && $(MAKE)
+structure: global
+	$(MAKE) -C ccp/structure
 
-analysis:
-	cd ccpnmr/analysis && $(MAKE)
+analysis: global
+	$(MAKE) -C ccpnmr/analysis
 
-clouds:
-	cd ccpnmr/clouds && $(MAKE)
+clouds: global
+	$(MAKE) -C ccpnmr/clouds
 
-dynamics:
-	cd ccpnmr/dynamics && $(MAKE)
+dynamics: global
+	$(MAKE) -C ccpnmr/dynamics
 
-bayes:
-	cd other/cambridge/bayes && $(MAKE)
+bayes: global
+	$(MAKE) -C other/cambridge/bayes
 
 clean: global_clean structure_clean analysis_clean clouds_clean dynamics_clean bayes_clean
 



1.1                  sci-chemistry/ccpn/files/xeasy2azara

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccpn/files/xeasy2azara?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/ccpn/files/xeasy2azara?rev=1.1&content-type=text/plain

Index: xeasy2azara
===================================================================
#!/bin/bash

export CCPNMR_TOP_DIR=gentoo_sitedir
export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
export LD_LIBRARY_PATH=gentoolibdir
export TCL_LIBRARY=gentootcl
export TK_LIBRARY=gentootk
gentoopython -O ${CCPNMR_TOP_DIR}/ccpn/python/ccp/format/spectra/params/XeasyData.py $1 $2 $3 $4 $5 $6