summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabioLolix2024-08-09 00:25:03 +0200
committerFabioLolix2024-08-09 00:25:03 +0200
commit7c1adcf71b436c22b9520001157bd86f2010a4b2 (patch)
treef9b6a2646643278e54a55b79843d705991e55433
parente846f0a22038f3a00246734ee15911bf5f4cac1f (diff)
downloadaur-7c1adcf71b436c22b9520001157bd86f2010a4b2.tar.gz
Safer way to set TCLLIBPATH by GPereira
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD5
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 425149bb41b3..69c02ed77cd5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = linuxcnc
pkgdesc = Controls CNC machines. It can drive milling machines, lathes, 3d printers, laser cutters, plasma cutters, robot arms, hexapods, and more (formerly EMC2)
pkgver = 2.9.3
- pkgrel = 1
+ pkgrel = 2
url = https://linuxcnc.org/
arch = x86_64
license = GPL2
diff --git a/PKGBUILD b/PKGBUILD
index 024d5fc13ebd..f0025940244b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
# Maintainer: Fabio 'Lolix' Loli <fabio.loli@disroot.org> -> https://github.com/FabioLolix
+# Contributor: Gonçalo Pereira
# Contributor: Jason Kercher <jkercher43 a gmail>
# Contributor: Peter Ivanov <ivanovp@gmail.com>
# Contributor: Alec Ari <neotheuser@ymail.com>
pkgname=linuxcnc
pkgver=2.9.3
-pkgrel=1
+pkgrel=2
pkgdesc="Controls CNC machines. It can drive milling machines, lathes, 3d printers, laser cutters, plasma cutters, robot arms, hexapods, and more (formerly EMC2)"
arch=(x86_64)
license=(GPL2 'custom: unredestributable')
@@ -25,7 +26,7 @@ sha256sums=('061d78ad404492fe80fbc013dfd3138c9a31d0c8e38e0a4e4eaa36d40efce816'
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}/src"
- echo "export TCLLIBPATH="$TCLLIBPATH /usr/lib/tcltk/linuxcnc"" > ${pkgname}.sh
+ echo "[[ ":\$TCLLIBPATH:" != *":/usr/lib/tcltk/linuxcnc:"* ]] && export TCLLIBPATH="/usr/lib/tcltk/linuxcnc:\$TCLLIBPATH"" > ${pkgname}.sh
find . -iname fixpaths.py -o -iname checkglade -o \
-iname update_ini | xargs perl -p -i -e "s/python/python2/"
patch -Np2 -i $srcdir/libtirpc.patch