summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Holst2022-10-07 14:56:52 +0000
committerHenrik Holst2022-10-07 14:56:52 +0000
commit199581308be7c120a1314f84f230b89ba0c0e519 (patch)
tree12f3fd32cd17412aec431e9b88184d9c97132692
parentdebe90995fdac33165c56f170d17a9924615ff7f (diff)
downloadaur-199581308be7c120a1314f84f230b89ba0c0e519.tar.gz
Fix build errors on modern GCC linker
-rw-r--r--PKGBUILD6
-rw-r--r--eukleides-1.5.4.patch28
2 files changed, 31 insertions, 3 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 1d664a34f4b8..2def3710bfcf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# https://bz-attachments.freebsd.org/attachment.cgi?id=155711&action=diff&format=raw&headers=1
pkgname=eukleides
pkgver=1.5.4
-pkgrel=1
+pkgrel=2
epoch=
pkgdesc="Eukleides is a computer language devoted to elementary plane geometry."
arch=(x86_64)
@@ -11,7 +11,7 @@ url="http://eukleides.org/"
license=('GPL')
groups=()
depends=()
-makedepends=(gcc make texinfo)
+makedepends=(gcc make flex bison texinfo)
checkdepends=()
optdepends=()
provides=()
@@ -23,7 +23,7 @@ install=
changelog=
source=("http://eukleides.org/files/$pkgname-$pkgver.tar.bz2" "$pkgname-$pkgver.patch")
noextract=()
-md5sums=(2c88fc857008c2ce23c7848c60621548 ab133aa2149f27e0b99a3536f26af411)
+md5sums=(2c88fc857008c2ce23c7848c60621548 bbc5626dcdeb15aaf31ecb9050f28982)
validpgpkeys=()
prepare() {
diff --git a/eukleides-1.5.4.patch b/eukleides-1.5.4.patch
index 042753f650dd..1a477b3f1f40 100644
--- a/eukleides-1.5.4.patch
+++ b/eukleides-1.5.4.patch
@@ -15,3 +15,31 @@
% ------------------------------------------------------------------------------
+--- src/common/triangle.c 2010-04-27 06:31:00.000000000 +0000
++++ src/common/triangle.c 2022-10-07 13:53:08.065041358 +0000
+@@ -26,9 +26,9 @@
+
+ #define STO(addr) (POP(_symbol))->content->value.point = (addr)
+
+-_point *A, *B, *C;
++static _point *A, *B, *C;
+
+-double a, x, y;
++static double a, x, y;
+
+ void assign_A_B(int p)
+ {
+--- src/common/quadrilateral.c 2010-04-27 06:31:00.000000000 +0000
++++ src/common/quadrilateral.c 2022-10-07 13:57:47.751483202 +0000
+@@ -26,9 +26,9 @@
+
+ #define STO(addr) (POP(_symbol))->content->value.point = (addr)
+
+-double l, m, x, y, u, v;
++static double l, m, x, y, u, v;
+
+-_point *A, *B, *C, *D;
++static _point *A, *B, *C, *D;
+
+ void assign(int p, int s)
+ {