Attachment #202876 for bug #236546

Lines 3-8 Link Here

(-)math/mprime/Makefile (-2 / +7 lines)
3		3
4	PORTNAME= mprime	4	PORTNAME= mprime
5	PORTVERSION= 29.4b7	5	PORTVERSION= 29.4b7
		6	PORTREVISION= 1
6	CATEGORIES= math benchmarks net	7	CATEGORIES= math benchmarks net
7	MASTER_SITES= http://www.mersenne.org/ftp_root/gimps/ \	8	MASTER_SITES= http://www.mersenne.org/ftp_root/gimps/ \
8	ftp://mersenne.org/gimps/	9	ftp://mersenne.org/gimps/
Lines 23-32 Link Here
23	libgmp.so:math/gmp	24	libgmp.so:math/gmp
24		25
25	USES= zip	26	USES= zip
		27	USE_GCC= any
		28	GCC_BUILD_ONLY= yes
		29
26	NO_WRKSUBDIR= yes	30	NO_WRKSUBDIR= yes
27	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	31	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
28	PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}	32	PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
29	MAKEFILE= makebsd	33	MAKEFILE= makebsd
		34	MAKE_ARGS+= __MAKE_CONF=${NONEXISTENT}
30	ALL_TARGET= mprime	35	ALL_TARGET= mprime
31		36
32	SUB_FILES= wrapper.sh	37	SUB_FILES= wrapper.sh
Lines 48-56 Link Here
48		53
49	pre-build:	54	pre-build:
50	.if ${ARCH} == "amd64"	55	.if ${ARCH} == "amd64"
51	@${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${PATCH_WRKSRC}/gwnum -f makebsd64	56	@${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${PATCH_WRKSRC}/gwnum ${MAKE_FLAGS} makebsd64 ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g}
52	.elif ${ARCH} == "i386"	57	.elif ${ARCH} == "i386"
53	@${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${PATCH_WRKSRC}/gwnum -f makemsys	58	@${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${PATCH_WRKSRC}/gwnum ${MAKE_FLAGS} makemsys ${_MAKE_JOBS} ${MAKE_ARGS:C,^${DESTDIRNAME}=.*,,g}
54	.endif	59	.endif
55		60
56	do-install:	61	do-install:




--- gwnum/makemsys.orig	2016-10-30 18:42:08 UTC
+++ gwnum/makemsys
@@ -1,13 +1,13 @@
 # Makefile for Mingw/msys gwnum library
 #
 
-CC = gcc
-CFLAGS = -I.. -I../sqlite-amalgamation-3180000 -O2 -march=i486 -malign-double
+#CC = cc
+CFLAGS += -I.. -I../sqlite-amalgamation-3180000 -march=i486
 
-CPP = g++
-CPPFLAGS = -I.. -I../qd -O2 -march=i486 -malign-double
+CPP = ${CXX}
+CPPFLAGS = ${CXXFLAGS} -I.. -I../qd -march=i486
 
-AR = ar
+#AR = ar
 
 LINUXOBJS = cpuid.o gwnum.o gwtables.o gwthread.o gwini.o gwbench.o gwutil.o gwdbldbl.o giants.o ecmstag1.o
 




 # Configure hwloc with --enable-static --disable-shared --disable-pci --disable-cuda --disable-gl
 #
 
-CC = cc
-CFLAGS = -I.. -I../gwnum -I/usr/local/include -DX86_64 -O2
+#CC = cc
+CFLAGS += -I.. -I../gwnum -I%%LOCALBASE%%/include -DX86_64
 
-CPP = cc
-CPPFLAGS = -I.. -I../gwnum -DX86_64 -O2
+CPP = ${CXX}
+CPPFLAGS = ${CXXFLAGS} -I.. -I../gwnum -DX86_64
 
-LFLAGS = -L/usr/local/lib -Wl,-M
-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread /usr/local/lib/libhwloc.a -lcurl -lstdc++ -lcompat -lgmp
+LFLAGS += -L%%LOCALBASE%%/lib ${LDFLAGS}
+LIBS += ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lhwloc -lcurl -lcompat -lgmp
 
 FACTOROBJ = factor64.o
 OBJS = prime.o menu.o




 
-CC = gcc
-CFLAGS = -I.. -I../gwnum -I/usr/local/include -O2 -march=i486 -malign-double
+#CC = cc
+CFLAGS = -I.. -I../gwnum -I%%LOCALBASE%%/include -O2 -march=i486
 
-CPP = g++
-CPPFLAGS = -I.. -I../gwnum -I/usr/local/include -O2 -march=i486 -malign-double
+CPP = ${CXX}
+CPPFLAGS = ${CXXFLAGS} -I.. -I../gwnum -I%%LOCALBASE%%/include -O2 -march=i486
 
-LFLAGS = -Wl,-M -L/usr/local/lib
-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic /usr/local/lib/libhwloc.a -Wl,-Bstatic /usr/local/lib/libcurl.a -lz -lcompat -lstdc++ -Wl,-Bdynamic -lssl -lgmp
+LFLAGS = -L%%LOCALBASE%%/lib ${LDFLAGS}
+LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lcurl -lhwloc -lz -lcompat -lssl -lgmp
 
 FACTOROBJ = factor32.o

Return to bug 236546

Lines 1-18 Link Here

(-)math/mprime/files/patch-gwnum_makemsys (-6 / +9 lines)
1	--- gwnum/makemsys.orig 2016-10-30 18:42:08 UTC	1	--- gwnum/makemsys.orig 2016-10-30 18:42:08 UTC
2	+++ gwnum/makemsys	2	+++ gwnum/makemsys
3	@@ -1,11 +1,11 @@	3	@@ -1,13 +1,13 @@
4	# Makefile for Mingw/msys gwnum library	4	# Makefile for Mingw/msys gwnum library
5	#	5	#
6		6
7	-CC = gcc	7	-CC = gcc
8	-CFLAGS = -I.. -I../sqlite-amalgamation-3180000 -O2 -march=i486 -malign-double	8	-CFLAGS = -I.. -I../sqlite-amalgamation-3180000 -O2 -march=i486 -malign-double
9	+CC = cc	9	+#CC = cc
10	+CFLAGS = -I.. -I../sqlite-amalgamation-3180000 -O2 -march=i486	10	+CFLAGS += -I.. -I../sqlite-amalgamation-3180000 -march=i486
11		11
12	-CPP = g++	12	-CPP = g++
13	-CPPFLAGS = -I.. -I../qd -O2 -march=i486 -malign-double	13	-CPPFLAGS = -I.. -I../qd -O2 -march=i486 -malign-double
14	+CPP = cc	14	+CPP = ${CXX}
15	+CPPFLAGS = -I.. -I../qd -O2 -march=i486	15	+CPPFLAGS = ${CXXFLAGS} -I.. -I../qd -march=i486
16		16
17	AR = ar	17	-AR = ar
		18	+#AR = ar
18		19
		20	LINUXOBJS = cpuid.o gwnum.o gwtables.o gwthread.o gwini.o gwbench.o gwutil.o gwdbldbl.o giants.o ecmstag1.o
		21

Lines 10-26 Link Here

(-)math/mprime/files/patch-linux64_makebsd (-6 / +9 lines)
10	# Configure hwloc with --enable-static --disable-shared --disable-pci --disable-cuda --disable-gl	10	# Configure hwloc with --enable-static --disable-shared --disable-pci --disable-cuda --disable-gl
11	#	11	#
12		12
13	CC = cc	13	-CC = cc
14	-CFLAGS = -I.. -I../gwnum -I/usr/local/include -DX86_64 -O2	14	-CFLAGS = -I.. -I../gwnum -I/usr/local/include -DX86_64 -O2
15	+CFLAGS = -I.. -I../gwnum -I%%LOCALBASE%%/include -DX86_64 -O2	15	+#CC = cc
		16	+CFLAGS += -I.. -I../gwnum -I%%LOCALBASE%%/include -DX86_64
16		17
17	CPP = cc	18	-CPP = cc
18	CPPFLAGS = -I.. -I../gwnum -DX86_64 -O2	19	-CPPFLAGS = -I.. -I../gwnum -DX86_64 -O2
		20	+CPP = ${CXX}
		21	+CPPFLAGS = ${CXXFLAGS} -I.. -I../gwnum -DX86_64
19		22
20	-LFLAGS = -L/usr/local/lib -Wl,-M	23	-LFLAGS = -L/usr/local/lib -Wl,-M
21	-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread /usr/local/lib/libhwloc.a -lcurl -lstdc++ -lcompat -lgmp	24	-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread /usr/local/lib/libhwloc.a -lcurl -lstdc++ -lcompat -lgmp
22	+LFLAGS = -L%%LOCALBASE%%/lib	25	+LFLAGS += -L%%LOCALBASE%%/lib ${LDFLAGS}
23	+LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lhwloc -lcurl -lcompat -lgmp	26	+LIBS += ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lhwloc -lcurl -lcompat -lgmp
24		27
25	FACTOROBJ = factor64.o	28	FACTOROBJ = factor64.o
26	OBJS = prime.o menu.o	29	OBJS = prime.o menu.o

Lines 6-22 Link Here

(-)math/mprime/files/patch-linux_makebsd (-4 / +4 lines)
6		6
7	-CC = gcc	7	-CC = gcc
8	-CFLAGS = -I.. -I../gwnum -I/usr/local/include -O2 -march=i486 -malign-double	8	-CFLAGS = -I.. -I../gwnum -I/usr/local/include -O2 -march=i486 -malign-double
9	+CC = cc	9	+#CC = cc
10	+CFLAGS = -I.. -I../gwnum -I%%LOCALBASE%%/include -O2 -march=i486	10	+CFLAGS = -I.. -I../gwnum -I%%LOCALBASE%%/include -O2 -march=i486
11		11
12	-CPP = g++	12	-CPP = g++
13	-CPPFLAGS = -I.. -I../gwnum -I/usr/local/include -O2 -march=i486 -malign-double	13	-CPPFLAGS = -I.. -I../gwnum -I/usr/local/include -O2 -march=i486 -malign-double
14	+CPP = cc	14	+CPP = ${CXX}
15	+CPPFLAGS = -I.. -I../gwnum -I%%LOCALBASE%%/include -O2 -march=i486	15	+CPPFLAGS = ${CXXFLAGS} -I.. -I../gwnum -I%%LOCALBASE%%/include -O2 -march=i486
16		16
17	-LFLAGS = -Wl,-M -L/usr/local/lib	17	-LFLAGS = -Wl,-M -L/usr/local/lib
18	-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic /usr/local/lib/libhwloc.a -Wl,-Bstatic /usr/local/lib/libcurl.a -lz -lcompat -lstdc++ -Wl,-Bdynamic -lssl -lgmp	18	-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic /usr/local/lib/libhwloc.a -Wl,-Bstatic /usr/local/lib/libcurl.a -lz -lcompat -lstdc++ -Wl,-Bdynamic -lssl -lgmp
19	+LFLAGS = -L%%LOCALBASE%%/lib	19	+LFLAGS = -L%%LOCALBASE%%/lib ${LDFLAGS}
20	+LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lcurl -lhwloc -lz -lcompat -lssl -lgmp	20	+LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lcurl -lhwloc -lz -lcompat -lssl -lgmp
21		21
22	FACTOROBJ = factor32.o	22	FACTOROBJ = factor32.o