casa / casa-mp-base / 7fc418caab0

Commits

Ken Cunningham authored and Ken committed 7fc418caab0 15 Apr 2018

ccpnmr: repair openmp to fix compilation

closes: https://trac.macports.org/ticket/56292
closes: https://trac.macports.org/ticket/53953

Modified


121 121	+ALL_LIB_FLAGS = $(GL_LIB_FLAGS) $(X11_LIB_FLAGS) $(TCL_LIB_FLAGS) $(TK_LIB_FLAGS)
122 122
123 123	ALL_LIB = $(GL_LIB) $(TK_LIB) $(X11_LIB) $(MATH_LIB)
124 124
125 125	--- ccpnmr2.4/c/environment-opengl.txt.orig 2012-04-08 17:31:08.000000000 -0400
126 126	+++ ccpnmr2.4/c/environment-opengl.txt 2012-04-08 17:33:55.000000000 -0400
127 127	@@ -0,0 +1,56 @@
128 128	+#Environment file for use with fink to build ccpnmr suite - environment.txt
129 129	+
130 130	+CC = @CC@
131 -	+LINK = $(CC)
131 +	+LINK = $(CC) -fopenmp
132 132	+MAKE = make
133 133	+CO_NAME = -c $<
134 134	+OUT_NAME = -o $@
135 135	+OBJ_SUFFIX = o
136 136	+DYLIB_SUFFIX = so
137 137	+RM = rm -f
138 138	+WIN_FLAG =
139 139	+
140 140	+MALLOC_FLAG =
141 141	+FPIC_FLAG = -fPIC
142 142	+CFLAGS = -O3 $(MALLOC_FLAG) $(FPIC_FLAG) -fno-common -ffast-math
143 143	+CC_FLAGS = $(CFLAGS) $(ARCHFLAGS)
144 144	+
145 145	+LINK_LIBRARIES = sh linkSharedObjs
146 146	+COPY_LIBRARIES = sh copySharedObjs
147 147	+
148 148	+OPENMP_FLAGS = -fopenmp
149 -	+OPENMP_LIB = -L@GCCLIB@ -lgomp
149 +	+OPENMP_LIB =
150 150	+
151 151	+GL_FLAG = -DUSE_GL_TRUE
152 152	+
153 153	+GLUT_NEED_INIT = -DNEED_GLUT_INIT
154 154	+GLUT_FLAG = $(GLUT_NEED_INIT) $(GLUT_NOT_IN_GL)
155 155	+
156 156	+SHARED_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"
157 157	+
158 158	+MATH_LIB = -lm
159 159	+