Ticket #56292: ccpnmr.patch

File ccpnmr.patch, 5.8 KB (added by jwhowarth, 7 years ago)

revised patch to avoid explicit passing named openmp library and to rely on -fopenmp flag to handle this for us.

  • bin/analysis

    old new  
     1#!/bin/sh
     2
     3export MallocLogFile=/dev/null
     4
     5if [ ${SSH_TTY} ]; then
     6    export LIBGL_ALWAYS_INDIRECT=1
     7fi
     8
     9@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.4/python/ccpnmr/analysis/AnalysisGui.py $1 $2 $3 $4 $5

  • bin/formatConverter

    old new  
     1#!/bin/sh
     2
     3export MallocLogFile=/dev/null
     4
     5if [ ${SSH_TTY} ]; then
     6    export LIBGL_ALWAYS_INDIRECT=1
     7fi
     8
     9@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.4/python/ccpnmr/format/gui/FormatConverter.py $1 $2

  • bin/pipe2azara

    old new  
     1#!/bin/sh
     2
     3export MallocLogFile=/dev/null
     4
     5if [ ${SSH_TTY} ]; then
     6    export LIBGL_ALWAYS_INDIRECT=1
     7fi
     8
     9@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.4/python/ccpnmr/analysis/NmrPipeData.py $1 $2 $3

  • bin/dataShifter

    old new  
     1#!/bin/sh
     2
     3export MallocLogFile=/dev/null
     4
     5if [ ${SSH_TTY} ]; then
     6    export LIBGL_ALWAYS_INDIRECT=1
     7fi
     8
     9@PYTHON_BIN@ -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.4/python/ccpnmr/format/gui/DataShifter.py

  • bin/updateAll

    old new  
     1#!/bin/sh
     2
     3export MallocLogFile=/dev/null
     4
     5if [ ${SSH_TTY} ]; then
     6    export LIBGL_ALWAYS_INDIRECT=1
     7fi
     8
     9@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.4/python/ccpnmr/update/UpdateAuto.py

  • bin/updateCheck

    old new  
     1#!/bin/sh
     2
     3export MallocLogFile=/dev/null
     4
     5if [ ${SSH_TTY} ]; then
     6    export LIBGL_ALWAYS_INDIRECT=1
     7fi
     8
     9@PYTHON_BIN@ -i -O @PYTHON_PKGD@/ccpnmr/ccpnmr2.4/python/ccpnmr/update/UpdatePopup.py

  • ccpnmr2.4/c/ccp/structure/Makefile

    old new  
    4040        $(GLOBAL_DIR)/py_tk_handler.$(OBJ_SUFFIX) \
    4141        $(GLOBAL_DIR)/py_tk_util.$(OBJ_SUFFIX)
    4242
    43 ALL_INCLUDE_FLAGS = $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \
    44         $(X11_INCLUDE_FLAGS) \
    45         $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
     43ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(GLOBAL_INCLUDE_FLAGS) \
     44        $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
     45        $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
    4646
    47 ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS)
     47ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TK_LIB_FLAGS)
    4848
    4949ALL_LIB = $(GL_LIB) $(TK_LIB) $(X11_LIB) $(MATH_LIB)
    5050

  • ccpnmr2.4/c/ccpnmr/analysis/Makefile

    old new  
    5555        $(GLOBAL_DIR)/py_tk_handler.$(OBJ_SUFFIX) \
    5656        $(GLOBAL_DIR)/py_tk_util.$(OBJ_SUFFIX)
    5757
    58 ALL_INCLUDE_FLAGS = $(GLOBAL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) \
    59         $(X11_INCLUDE_FLAGS) \
    60         $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
     58ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(GLOBAL_INCLUDE_FLAGS) \
     59        $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
     60        $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
    6161
    62 ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS)
     62ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TK_LIB_FLAGS)
    6363
    6464ALL_LIB = $(GL_LIB) $(TK_LIB) $(X11_LIB) $(MATH_LIB)
    6565

  • ccpnmr2.4/c/memops/global/Makefile

    old new  
    137137
    138138TCLTK_LIB = $(TK_LIB) $(X11_LIB) $(MATH_LIB)
    139139
    140 ALL_INCLUDE_FLAGS = $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
    141         $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS) $(GL_INCLUDE_FLAGS)
     140ALL_INCLUDE_FLAGS = $(GL_INCLUDE_FLAGS) $(PYTHON_INCLUDE_FLAGS) $(X11_INCLUDE_FLAGS) \
     141        $(TCL_INCLUDE_FLAGS) $(TK_INCLUDE_FLAGS)
    142142
    143 ALL_LIB_FLAGS = $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS) $(GL_LIB_FLAGS)
     143ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS)
    144144
    145145ALL_LIB = $(GL_LIB) $(TK_LIB) $(X11_LIB) $(MATH_LIB)
    146146

  • ccpnmr2.4/c/environment-opengl.txt

    old new  
     1#Environment file for use with fink to build ccpnmr suite - environment.txt
     2
     3CC = @CC@
     4LINK = $(CC) -fopenmp
     5MAKE = make
     6CO_NAME = -c $<
     7OUT_NAME = -o $@
     8OBJ_SUFFIX = o
     9DYLIB_SUFFIX = so
     10RM = rm -f
     11WIN_FLAG =
     12
     13MALLOC_FLAG =
     14FPIC_FLAG = -fPIC
     15CFLAGS = -O3 $(MALLOC_FLAG) $(FPIC_FLAG) -fno-common -ffast-math
     16CC_FLAGS = $(CFLAGS) $(ARCHFLAGS)
     17
     18LINK_LIBRARIES = sh linkSharedObjs
     19COPY_LIBRARIES = sh copySharedObjs
     20
     21OPENMP_FLAGS = -fopenmp
     22OPENMP_LIB  =
     23
     24GL_FLAG = -DUSE_GL_TRUE
     25
     26GLUT_NEED_INIT = -DNEED_GLUT_INIT
     27GLUT_FLAG = $(GLUT_NEED_INIT) $(GLUT_NOT_IN_GL)
     28
     29SHARED_FLAGS = -L@PREFIX@/lib -bundle -bundle_loader @PYTHON_BIN@ "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
     30
     31MATH_LIB = -lm
     32
     33X11_DIR = /usr/X11R6
     34X11_LIB = -lX11 -lXext
     35X11_INCLUDE_FLAGS = -I$(X11_DIR)/include
     36X11_LIB_FLAGS = -L$(X11_DIR)/lib
     37
     38TCL_DIR = @PREFIX@
     39TCL_LIB = -ltcl
     40TCL_INCLUDE_FLAGS = -I$(TCL_DIR)/include
     41TCL_LIB_FLAGS = -L$(TCL_DIR)/lib
     42
     43TK_DIR = @PREFIX@
     44TK_LIB = -ltk
     45TK_INCLUDE_FLAGS = -I$(TK_DIR)/include
     46TK_LIB_FLAGS = -L$(TK_DIR)/lib
     47
     48PYTHON_DIR = @PREFIX@
     49PYTHON_LIB =
     50PYTHON_INCLUDE_FLAGS = -I@PYTHON_INCL@
     51PYTHON_LIB_FLAGS = -L@PREFIX@ -lpython2.7
     52
     53GL_DIR = /usr/X11R6
     54GL_LIB = -lglut -lGLU -lGL
     55GL_INCLUDE_FLAGS = -I$(GL_DIR)/include -I@PREFIX@/include
     56GL_LIB_FLAGS = -L$(GL_DIR)/lib -L@PREFIX@/lib