Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21095
Modified Files:
ccpnmr-py.patch
Log Message:
update to 2.3.0r2, use -j1 for c code to avoid race in Makefiles, fix order of
includes, fix linkage to only use gcc48-shlibs, tweak up optimization to -fOfast
Index: ccpnmr-py.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/ccpnmr-py.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ccpnmr-py.patch 31 Mar 2013 15:03:43 -0000 1.3
+++ ccpnmr-py.patch 27 Jun 2013 14:27:09 -0000 1.4
@@ -10,7 +10,7 @@
+ export LIBGL_ALWAYS_INDIRECT=1
+fi
+
-+@PREFIX@/bin/python2.X -i -O
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr2.2/python/ccpnmr/analysis/AnalysisGui.py
$1 $2 $3 $4 $5
++@PREFIX@/bin/python2.X -i -O
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr2.3/python/ccpnmr/analysis/AnalysisGui.py
$1 $2 $3 $4 $5
diff -uNr ccpnmr/bin/dataShifter ccpnmr.fink/bin/dataShifter
--- ccpnmr/bin/dataShifter 1969-12-31 19:00:00.000000000 -0500
+++ ccpnmr.fink/bin/dataShifter 2012-04-08 15:48:46.000000000 -0400
@@ -23,7 +23,7 @@
+ export LIBGL_ALWAYS_INDIRECT=1
+fi
+
-+@PREFIX@/bin/python2.X -O
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr2.2/python/ccpnmr/format/gui/DataShifter.py
++@PREFIX@/bin/python2.X -O
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr2.3/python/ccpnmr/format/gui/DataShifter.py
diff -uNr ccpnmr/bin/formatConverter ccpnmr.fink/bin/formatConverter
--- ccpnmr/bin/formatConverter 1969-12-31 19:00:00.000000000 -0500
+++ ccpnmr.fink/bin/formatConverter 2012-04-08 15:48:46.000000000 -0400
@@ -36,7 +36,7 @@
+ export LIBGL_ALWAYS_INDIRECT=1
+fi
+
-+@PREFIX@/bin/python2.X -O
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr2.2/python/ccpnmr/format/gui/FormatConverter.py
$1 $2
++@PREFIX@/bin/python2.X -O
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr2.3/python/ccpnmr/format/gui/FormatConverter.py
$1 $2
diff -uNr ccpnmr/bin/pipe2azara ccpnmr.fink/bin/pipe2azara
--- ccpnmr/bin/pipe2azara 1969-12-31 19:00:00.000000000 -0500
+++ ccpnmr.fink/bin/pipe2azara 2012-04-08 15:48:46.000000000 -0400
@@ -49,7 +49,7 @@
+ export LIBGL_ALWAYS_INDIRECT=1
+fi
+
-+@PREFIX@/bin/python2.X -O
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr2.2/python/ccpnmr/analysis/NmrPipeData.py
$1 $2 $3
++@PREFIX@/bin/python2.X -O
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr2.3/python/ccpnmr/analysis/NmrPipeData.py
$1 $2 $3
diff -uNr ccpnmr/bin/updateAll ccpnmr.fink/bin/updateAll
--- ccpnmr/bin/updateAll 1969-12-31 19:00:00.000000000 -0500
+++ ccpnmr.fink/bin/updateAll 2012-04-08 15:48:46.000000000 -0400
@@ -62,7 +62,7 @@
+ export LIBGL_ALWAYS_INDIRECT=1
+fi
+
-+@PREFIX@/bin/python2.X -i -O
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr2.2/python/ccpnmr/update/UpdateAuto.py
++@PREFIX@/bin/python2.X -i -O
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr2.3/python/ccpnmr/update/UpdateAuto.py
diff -uNr ccpnmr/bin/updateCheck ccpnmr.fink/bin/updateCheck
--- ccpnmr/bin/updateCheck 1969-12-31 19:00:00.000000000 -0500
+++ ccpnmr.fink/bin/updateCheck 2012-04-08 15:48:46.000000000 -0400
@@ -75,10 +75,10 @@
+ export LIBGL_ALWAYS_INDIRECT=1
+fi
+
-+@PREFIX@/bin/python2.X -i -O
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr2.2/python/ccpnmr/update/UpdatePopup.py
-diff -uNr ccpnmr/ccpnmr2.2/c/ccp/structure/Makefile
ccpnmr.fink/ccpnmr2.2/c/ccp/structure/Makefile
---- ccpnmr/ccpnmr2.2/c/ccp/structure/Makefile 2012-03-13 12:30:17.000000000
-0400
-+++ ccpnmr.fink/ccpnmr2.2/c/ccp/structure/Makefile 2012-04-08
15:52:11.000000000 -0400
++@PREFIX@/bin/python2.X -i -O
@PREFIX@/lib/python2.X/site-packages/ccpnmr/ccpnmr2.3/python/ccpnmr/update/UpdatePopup.py
+diff -uNr ccpnmr/ccpnmr2.3/c/ccp/structure/Makefile
ccpnmr.fink/ccpnmr2.3/c/ccp/structure/Makefile
+--- ccpnmr/ccpnmr2.3/c/ccp/structure/Makefile 2012-03-13 12:30:17.000000000
-0400
++++ ccpnmr.fink/ccpnmr2.3/c/ccp/structure/Makefile 2012-04-08
15:52:11.000000000 -0400
@@ -40,11 +40,11 @@
$(GLOBAL_DIR)/py_tk_handler.$(OBJ_SUFFIX) \
$(GLOBAL_DIR)/py_tk_util.$(OBJ_SUFFIX)
@@ -87,18 +87,18 @@
- $(X11_INCLUDE_FLAGS) \
- $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
+ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(GLOBAL_INCLUDE_FLAGS) \
-+ $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
-+ $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
++ $(PYTHON_INCLUDE_FLAGS) $(TCL_INCLUDE_FLAGS) \
++ $(TK_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS)
-ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS)
-+ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TK_LIB_FLAGS)
++ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(TK_LIB_FLAGS) $(X11_LIB_FLAGS)
ALL_LIB = $(GL_LIB) $(TK_LIB) $(X11_LIB) $(MATH_LIB)
-diff -uNr ccpnmr/ccpnmr2.2/c/ccpnmr/analysis/Makefile
ccpnmr.fink/ccpnmr2.2/c/ccpnmr/analysis/Makefile
---- ccpnmr/ccpnmr2.2/c/ccpnmr/analysis/Makefile 2012-03-13
12:30:17.000000000 -0400
-+++ ccpnmr.fink/ccpnmr2.2/c/ccpnmr/analysis/Makefile 2012-04-08
15:53:38.000000000 -0400
-@@ -55,11 +55,11 @@
+diff -uNr ccpnmr/ccpnmr2.3/c/ccpnmr/analysis/Makefile
ccpnmr.fink/ccpnmr2.3/c/ccpnmr/analysis/Makefile
+--- ccpnmr/ccpnmr2.3/c/ccpnmr/analysis/Makefile 2012-03-13
12:30:17.000000000 -0400
++++ ccpnmr.fink/ccpnmr2.3/c/ccpnmr/analysis/Makefile 2012-04-08
15:53:38.000000000 -0400
+@@ -59,11 +59,11 @@
$(GLOBAL_DIR)/py_tk_handler.$(OBJ_SUFFIX) \
$(GLOBAL_DIR)/py_tk_util.$(OBJ_SUFFIX)
@@ -106,17 +106,17 @@
- $(X11_INCLUDE_FLAGS) \
- $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
+ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(GLOBAL_INCLUDE_FLAGS) \
-+ $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
-+ $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
++ $(PYTHON_INCLUDE_FLAGS) $(TCL_INCLUDE_FLAGS) \
++ $(TK_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS)
-ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS)
-+ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TK_LIB_FLAGS)
++ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(TK_LIB_FLAGS) $(X11_LIB_FLAGS)
ALL_LIB = $(GL_LIB) $(TK_LIB) $(X11_LIB) $(MATH_LIB)
-diff -uNr ccpnmr/ccpnmr2.2/c/environment-opengl.txt
ccpnmr.fink/ccpnmr2.2/c/environment-opengl.txt
---- ccpnmr/ccpnmr2.2/c/environment-opengl.txt 1969-12-31 19:00:00.000000000
-0500
-+++ ccpnmr.fink/ccpnmr2.2/c/environment-opengl.txt 2012-04-08
15:48:46.000000000 -0400
+diff -uNr ccpnmr/ccpnmr2.3/c/environment-opengl.txt
ccpnmr.fink/ccpnmr2.3/c/environment-opengl.txt
+--- ccpnmr/ccpnmr2.3/c/environment-opengl.txt 1969-12-31 19:00:00.000000000
-0500
++++ ccpnmr.fink/ccpnmr2.3/c/environment-opengl.txt 2012-04-08
15:48:46.000000000 -0400
@@ -0,0 +1,190 @@
+# should work if suitably edited for Linux, Irix, Solaris, OSX, Windows
+
@@ -171,7 +171,7 @@
+
+# optimisation flag
+# use below for everything except Windows
-+OPT_FLAG = -O3 $(MALLOC_FLAG) $(FPIC_FLAG) -fno-common -ffast-math -mtune=970
-maltivec
++OPT_FLAG = -Ofast $(MALLOC_FLAG) $(FPIC_FLAG) -fno-common -mtune=970 -maltivec
+# use below for Windows
+#OPT_FLAG = /Ox
+
@@ -179,7 +179,7 @@
+# use below if you have more than one cpu
+# (these flags for GNU CC, Intel CC differs)
+OPENMP_FLAGS = -fopenmp
-+OPENMP_LIB = -L@PREFIX@/lib/gcc4.7/lib -lgomp
++OPENMP_LIB = -L@PREFIX@/lib/gcc4.8/lib -lgomp
+# use below for Windows (note: after VS 2010 VCOMP.LIB is a paid upgrade,
+# but is available for free in VS 2008)
+#OPENMP_FLAGS = /OPENMP
@@ -308,20 +308,33 @@
+#GSL_LIB_FLAGS = -L$(GSL_DIR)/lib
+#GSL_LIB = -lgsl -lgslcblas
+
-diff -uNr ccpnmr/ccpnmr2.2/c/memops/global/Makefile
ccpnmr.fink/ccpnmr2.2/c/memops/global/Makefile
---- ccpnmr/ccpnmr2.2/c/memops/global/Makefile 2012-03-13 12:30:17.000000000
-0400
-+++ ccpnmr.fink/ccpnmr2.2/c/memops/global/Makefile 2012-04-08
15:48:46.000000000 -0400
-@@ -137,10 +137,10 @@
+diff -uNr ccpnmr/ccpnmr2.3/c/memops/global/Makefile
ccpnmr.fink/ccpnmr2.3/c/memops/global/Makefile
+--- ccpnmr/ccpnmr2.3/c/memops/global/Makefile 2012-03-13 12:30:17.000000000
-0400
++++ ccpnmr.fink/ccpnmr2.3/c/memops/global/Makefile 2012-04-08
15:48:46.000000000 -0400
+@@ -139,10 +139,10 @@
TCLTK_LIB = $(TK_LIB) $(X11_LIB) $(MATH_LIB)
-ALL_INCLUDE_FLAGS = $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
- $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
-+ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS)
$(X11_INCLUDE_FLAGS) \
-+ $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
++ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS)
$(TCL_INCLUDE_FLAGS) \
++ $(TK_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS)
-ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS)
$(GL_LIB_FLAGS)
-+ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS)
$(TK_LIB_FLAGS)
++ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS)
$(X11_LIB_FLAGS)
ALL_LIB = $(GL_LIB) $(TK_LIB) $(X11_LIB) $(MATH_LIB)
+--- ccpnmr/ccpnmr2.3/c/memops/global/Makefile.orig 2013-06-27
10:02:50.000000000 -0400
++++ ccpnmr/ccpnmr2.3/c/memops/global/Makefile 2013-06-27 10:03:27.000000000
-0400
+@@ -132,8 +132,8 @@
+ $(PY_UTIL_OBJS) \
+ py_fit.$(OBJ_SUFFIX)
+
+-TCLTK_INCLUDE_FLAGS = $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
+- $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
++TCLTK_INCLUDE_FLAGS = $(PYTHON_INCLUDE_FLAGS) $(TCL_INCLUDE_FLAGS) \
++ $(TK_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS)
+
+ TCLTK_LIB_FLAGS = $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS)
+
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
