Attachment #234975 for bug #264934

View | Details | Raw Unified | Return to bug 264934
Collapse All | Expand All

Lines 1-8 Link Here

(-)b/math/mprime/Makefile (-2 / +2 lines)
1	# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>	1	# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
2		2
3	PORTNAME= mprime	3	PORTNAME= mprime
4	PORTVERSION= 29.8b3	4	PORTVERSION= 30.7b9
5	PORTREVISION= 2
6	CATEGORIES= math benchmarks net	5	CATEGORIES= math benchmarks net
7	MASTER_SITES= http://www.mersenne.org/ftp_root/gimps/ \	6	MASTER_SITES= http://www.mersenne.org/ftp_root/gimps/ \
8	ftp://mersenne.org/gimps/	7	ftp://mersenne.org/gimps/
Lines 18-23 LICENSE_PERMS= dist-mirror pkg-mirror auto-accept Link Here
18		17
19	ONLY_FOR_ARCHS= amd64 i386	18	ONLY_FOR_ARCHS= amd64 i386
20		19
		20	BUILD_DEPENDS= ${LOCALBASE}/include/boost/circular_buffer.hpp:devel/boost-libs
21	LIB_DEPENDS= libcurl.so:ftp/curl \	21	LIB_DEPENDS= libcurl.so:ftp/curl \
22	libhwloc.so.15:devel/hwloc2 \	22	libhwloc.so.15:devel/hwloc2 \
23	libgmp.so:math/gmp	23	libgmp.so:math/gmp

Lines 1-3 Link Here

(-)b/math/mprime/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1557620197	1	TIMESTAMP = 1656319706
2	SHA256 (p95v298b3.source.zip) = dac67702e45689e058519164222b6a1f0b32d9e7c88049f7c59f9699174105f0	2	SHA256 (p95v307b9.source.zip) = e89ce78b01eb3055f5503eabd9d0aec95e1e832361f3f2987098969fe649fdb5
3	SIZE (p95v298b3.source.zip) = 51553788	3	SIZE (p95v307b9.source.zip) = 50929924




--- gwnum/makemsys.orig	2019-04-23 03:05:20 UTC
+++ gwnum/makemsys
@@ -2,10 +2,10 @@
 # Makefile for Mingw/msys gwnum library
 #
 
 CC ?= cc
-CFLAGS = -I.. -I../sqlite-amalgamation-3180000 -O2 -march=i486
+CC ?= cc
+CFLAGS += -I.. -I../sqlite-amalgamation-3180000 -O2 -march=i486
 
 CXX ?= cc
-CXXFLAGS = -I.. -I../qd -O2 -march=i486
+CXX ?= cc
+CXXFLAGS += -I.. -I../qd -O2 -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
 
@@ -29,4 +29,4 @@ distclean: clean
 	$(CC) $(CFLAGS) -c $<




--- linux/makebsd.orig	2019-04-23 03:05:22 UTC
+++ linux/makebsd
@@ -7,13 +7,13 @@
 #
 
 CC ?= cc
-CFLAGS += -I.. -I../gwnum -I$(LOCALBASE)/include -O2 -march=i486 -malign-double
+CFLAGS += -I.. -I../gwnum -I$(LOCALBASE)/include -O2 -march=i486
 
 CXX ?= cc
-CXXFLAGS += -I.. -I../gwnum -I$(LOCALBASE)/include -O2 -march=i486 -malign-double
+CXXFLAGS += -I.. -I../gwnum -I$(LOCALBASE)/include -O2 -march=i486
 
-LDFLAGS += -fpie -Wl,-M -L$(LOCALBASE)/lib
-LIBS += ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -lz -lcompat -lstdc++ -Wl,-Bdynamic -lssl -lgmp
+LDFLAGS += -fpie -L$(LOCALBASE)/lib -Wl,-M
+LIBS += ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lhwloc -lcurl -lstdc++ -lcompat -lgmp
 
 FACTOROBJ = factor32.o
 OBJS = prime.o menu.o

Return to bug 264934

Lines 1-23 Link Here

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

Removed Link Here

(-)a/math/mprime/files/patch-linux_makebsd (-20 lines)
1	--- linux/makebsd.orig 2019-04-23 03:05:22 UTC
2	+++ linux/makebsd
3	@@ -7,13 +7,13 @@
4	#
5
6	CC ?= cc
7	-CFLAGS += -I.. -I../gwnum -I$(LOCALBASE)/include -O2 -march=i486 -malign-double
8	+CFLAGS += -I.. -I../gwnum -I$(LOCALBASE)/include -O2 -march=i486
9
10	CXX ?= cc
11	-CXXFLAGS += -I.. -I../gwnum -I$(LOCALBASE)/include -O2 -march=i486 -malign-double
12	+CXXFLAGS += -I.. -I../gwnum -I$(LOCALBASE)/include -O2 -march=i486
13
14	-LDFLAGS += -fpie -Wl,-M -L$(LOCALBASE)/lib
15	-LIBS += ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -lz -lcompat -lstdc++ -Wl,-Bdynamic -lssl -lgmp
16	+LDFLAGS += -fpie -L$(LOCALBASE)/lib -Wl,-M
17	+LIBS += ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lhwloc -lcurl -lstdc++ -lcompat -lgmp
18
19	FACTOROBJ = factor32.o
20	OBJS = prime.o menu.o