diff options
| author | graysky | 2024-03-14 15:35:42 -0400 |
|---|---|---|
| committer | graysky | 2024-03-14 15:35:42 -0400 |
| commit | 43f6d953ea3afd0abfe15dedc3e4d203b1b645e1 (patch) | |
| tree | 07f4f196b0e6dd26f275addfb2b4bf4274f72cf6 /0001-makefile-fix-build-for-Arch-Linux.patch | |
| parent | 58bd7796083e11dc6f3df6d14ec45b505779784a (diff) | |
| download | aur-43f6d953ea3afd0abfe15dedc3e4d203b1b645e1.tar.gz | |
Update to 30.19.13-1
Diffstat (limited to '0001-makefile-fix-build-for-Arch-Linux.patch')
| -rw-r--r-- | 0001-makefile-fix-build-for-Arch-Linux.patch | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/0001-makefile-fix-build-for-Arch-Linux.patch b/0001-makefile-fix-build-for-Arch-Linux.patch index 5e3e2a481965..e63dd496900c 100644 --- a/0001-makefile-fix-build-for-Arch-Linux.patch +++ b/0001-makefile-fix-build-for-Arch-Linux.patch @@ -1,41 +1,41 @@ -From da7641d4be383e1170ab39bc162480cb1836591e Mon Sep 17 00:00:00 2001 +From 7542155615e1af7f4ea45df986659c41085441e5 Mon Sep 17 00:00:00 2001 From: graysky <therealgraysky AT proton DOT me> -Date: Sat, 24 Sep 2022 14:12:44 -0400 +Date: Thu, 14 Mar 2024 15:33:41 -0400 Subject: [PATCH] makefile: fix build for Arch Linux Fix up for Arch Linux build. Thanks to Prime95 for the tip around polymult.a lib[1]. 1. https://www.mersenneforum.org/showthread.php?t=28094 - --- - linux64/makefile | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) + linux64/makefile | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/linux64/makefile b/linux64/makefile -index 420801f..a319fc1 100644 +index 61d130e..639c1bd 100644 --- a/linux64/makefile +++ b/linux64/makefile -@@ -18,15 +18,17 @@ - # 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 - -+ALFLAGS = -I.. -I../gwnum -march=x86-64 -DX86_64 -O2 -Wno-unused-result -march=x86-64 -DPORT=8 -+ +@@ -20,14 +20,17 @@ + # LIBS = ../gwnum/gwnum.a -lm -lpthread -Wl,-Bstatic $(shell pkg-config --static --libs libhwloc) -Wl,-Bstatic $(shell pkg-config --static --libs libcurl) -lstdc++ -Wl,-Bdynamic -ldl + CC = gcc -CFLAGS = -I.. -I../gwnum -I/usr/local/include -std=gnu99 -DX86_64 -Wno-unused-result -O2 -DPORT=8 +CFLAGS = ${ALFLAGS} - + CPP = g++ -CPPFLAGS = -I.. -I../gwnum -I../../boost_1_76_0 -DX86_64 -std=c++11 -O2 -DPORT=8 +CPPFLAGS = ${ALFLAGS} -std=c++11 - --LFLAGS = -Wl,-M -Wl,-L/usr/local/lib ++ +LFLAGS = -Wl,-M - #LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld ../gwnum/polymult.a -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -lz -lxml2 -ldl -lgmp --LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld ../gwnum/polymult.a -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl -lgmp -+LIBS= ../gwnum/gwnum.a ../gwnum/gwnum.ld ../gwnum/polymult.a -lm -lpthread $(shell pkg-config --libs libcurl) -lstdc++ $(shell pkg-config --static --libs hwloc) -lgmp - + +-LFLAGS = -Wl,-M -Wl,-L/usr/local/lib + #LIBS = ../gwnum/gwnum.a ../gwnum/polymult.a -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -lz -lxml2 -ldl -lgmp +-LIBS = ../gwnum/gwnum.a ../gwnum/polymult.a -lm -lpthread -Wl,-Bstatic -lhwloc -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl -lgmp ++LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld ../gwnum/polymult.a -lm -lpthread $(shell pkg-config --libs libcurl) -lstdc++ $(shell pkg-config --static --libs hwloc) -lgmp ++ ++ALFLAGS = -I.. -I../gwnum -march=x86-64 -DX86_64 -O2 -Wno-unused-result -march=x86-64 -DPORT=8 + FACTOROBJ = factor64.o LINUXOBJS = prime.o menu.o cJSON.o ecm.o exponentiate.o pair.o pm1prob.o --- -2.37.3 +-- +2.44.0 + |