-
-
Save qrwteyrutiyoup/4682d87516b1199fc424212ed8b1674f to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/PKGBUILD b/PKGBUILD | |
index cd3f5af..00d7dc0 100644 | |
--- a/PKGBUILD | |
+++ b/PKGBUILD | |
@@ -3,8 +3,8 @@ | |
# Contributer: TryA - https://bbs.archlinux.org/viewtopic.php?id=114996 | |
pkgname=mprime | |
-pkgver=291 | |
-pkgrel=5 | |
+pkgver=293 | |
+pkgrel=1 | |
pkgdesc="A GIMPS, distributed computing project client, dedicated to finding Mersenne primes." | |
arch=('x86_64') | |
url="http://www.mersenne.org" | |
@@ -13,8 +13,8 @@ depends=('curl' 'hwloc') | |
conflicts=('mprime-bin') | |
source=("http://www.mersenne.org/ftp_root/gimps/p95v${pkgver}.source.zip" | |
unfuck_makefile.patch) | |
-sha256sums=('b2af302d423765e1f053731f4c0dac6983a9598eb1b16fcf6159491dbb1c3972' | |
- 'c956812ed5f07c8f2f30c906734971f286558ff6267a0c2dfa602e1798e0cef9') | |
+sha256sums=('da6c73286a8736e6d7a9108441fd2b4628f670988e2340b22b6c4c4d3e374df5' | |
+ 'c94417f35f988e32693f9002792cbf21da85c2345670cb377066c9b799341528') | |
prepare () { | |
patch -Np1 -i unfuck_makefile.patch | |
diff --git a/unfuck_makefile.patch b/unfuck_makefile.patch | |
index b99034e..c62a208 100644 | |
--- a/unfuck_makefile.patch | |
+++ b/unfuck_makefile.patch | |
@@ -1,19 +1,24 @@ | |
---- a/linux64/makefile 2017-03-18 21:18:04.000000000 -0400 | |
-+++ b/linux64/makefile 2017-03-20 09:38:23.273509623 -0400 | |
-@@ -21,13 +21,13 @@ | |
+diff --git a/linux64/makefile b/linux64/makefile | |
+index 329cb51..88acbc6 100644 | |
+--- a/linux64/makefile | |
++++ b/linux64/makefile | |
+@@ -20,15 +20,15 @@ | |
+ # LFLAGS = -Wl,-M | |
# LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic $(shell pkg-config --static --libs libhwloc) -Wl,-Bstatic $(shell pkg-config --static --libs libcurl) -lstdc++ -Wl,-Bdynamic -ldl | |
++MPRIME_FLAGS=-I.. -I../gwnum -DX86_64 -march=x86-64 -O2 -Wno-unused-result | |
CC = gcc | |
-CFLAGS = -I.. -I../gwnum -I/usr/local/include -DX86_64 -O2 | |
-+CFLAGS = -I.. -I../gwnum -march=x86-64 -DX86_64 -O2 -Wno-unused-result | |
++CFLAGS = ${MPRIME_FLAGS} | |
CPP = g++ | |
-CPPFLAGS = -I.. -I../gwnum -DX86_64 -O2 | |
-+CPPFLAGS = -I.. -I../gwnum -march=x86-64 -O2 -Wno-unused-result | |
++CPPFLAGS = ${MPRIME_FLAGS} | |
LFLAGS = -Wl,-M -Wl,-L/usr/local/lib | |
--LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -lz -lxml2 -ldl | |
-+LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread $(shell pkg-config --libs libcurl) -lstdc++ $(shell pkg-config --static --libs hwloc) | |
+-#LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -lz -lxml2 -ldl -lgmp | |
+-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl -lgmp | |
++LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread $(shell pkg-config --libs libcurl) -lstdc++ $(shell pkg-config --static --libs hwloc) -lgmp | |
FACTOROBJ = factor64.o | |
LINUXOBJS = prime.o menu.o |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment