[arch-commits] Commit in tachyon/trunk (PKGBUILD tachyon-system-cflags.patch)

[Antonio Rojas]

    Date: Saturday, August 24, 2019 @ 23:42:08
  Author: arojas
Revision: 501622

Switch to sagemath tarball since upstream is gone (FS#63506), enforce system build flags

Added:
  tachyon/trunk/tachyon-system-cflags.patch
Modified:
  tachyon/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   36 ++++++++++++++++--------------------
 tachyon-system-cflags.patch |   17 +++++++++++++++++
 2 files changed, 33 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-24 22:49:02 UTC (rev 501621)
+++ PKGBUILD	2019-08-24 23:42:08 UTC (rev 501622)
@@ -3,7 +3,7 @@
 
 pkgname=tachyon
 pkgver=0.98.9
-pkgrel=5
+pkgrel=6
 pkgdesc="Multithreaded ray tracing software"
 arch=(x86_64)
 url="http://jedi.ks.uiuc.edu/~johns/raytracer/"
@@ -10,36 +10,32 @@
 license=(BSD)
 depends=(libjpeg-turbo libpng)
 makedepends=()
-source=("http://jedi.ks.uiuc.edu/~johns/raytracer/files/$pkgver/$pkgname-$pkgver.tar.gz" 'enable-jpeg-png.patch')
-sha256sums=('c6a3298ded4dc3e9390447819e1dac59b62c3d2d46d4154312ffe71549ee40d7'
-            'ecd6ab6274879e0f971e2eba17871fffe2e24dcc9a332013a0b100ee4857cc2c')
+#source=("http://jedi.ks.uiuc.edu/~johns/raytracer/files/$pkgver/$pkgname-$pkgver.tar.gz" 'enable-jpeg-png.patch')
+source=("https://mirrors.mit.edu/sage/spkg/upstream/tachyon/tachyon-$pkgver.tar.bz2" enable-jpeg-png.patch tachyon-system-cflags.patch)
+sha256sums=('e8888a410610e2726dca32f40f31ff34a83cb474b41e5a1e0ac8bbb175e1a466'
+            'ecd6ab6274879e0f971e2eba17871fffe2e24dcc9a332013a0b100ee4857cc2c'
+            '34f703af96afe117c851a5825b7fd6b71211c09e4a8c3b836d012d250bb6918f')
+_target=linux-64-thr
 
-case "$CARCH" in
-  "i686") _target=linux-thr ;;
-  "x86_64") _target=linux-64-thr ;;
-esac
-
 prepare(){
-  cd $pkgname
+  cd $pkgname-$pkgver
 # enable JPEG and PNG support
-  patch -p0 -i "$srcdir"/enable-jpeg-png.patch
+  patch -p0 -i ../enable-jpeg-png.patch
+# use system build flags
+  patch -p1 -i ../tachyon-system-cflags.patch
+  sed -e 's|${CC} ${CFLAGS}|${CC} ${CFLAGS} ${LDFLAGS}|g' -i unix/Makefile
 }
 
 build() {
-  cd $pkgname/unix
-  make $_target
+  cd $pkgname-$pkgver/unix
+  make $_target CC="gcc ${CFLAGS} ${LDFLAGS}"
 }
 
 package() {
-  cd $pkgname/compile/$_target
+  cd $pkgname-$pkgver/compile/$_target
   install -D -m 755 tachyon $pkgdir/usr/bin/tachyon
   install -D -m 644 libtachyon.a $pkgdir/usr/lib/libtachyon.a
 
-  cd $srcdir/$pkgname/scenes
-  install -d "$pkgdir"/usr/share/tachyon/scenes/imaps
-  install -m 644 README *.dat *.cam *.ac "$pkgdir"/usr/share/tachyon/scenes
-  install -m 644 imaps/* "$pkgdir"/usr/share/tachyon/scenes/imaps
-
   install -d "$pkgdir"/usr/share/licenses/tachyon
-  install $srcdir/$pkgname/Copyright "$pkgdir"/usr/share/licenses/tachyon
+  install "$srcdir"/$pkgname-$pkgver/Copyright "$pkgdir"/usr/share/licenses/tachyon
 }

Added: tachyon-system-cflags.patch
===================================================================
--- tachyon-system-cflags.patch	                        (rev 0)
+++ tachyon-system-cflags.patch	2019-08-24 23:42:08 UTC (rev 501622)
@@ -0,0 +1,17 @@
+--- tachyon/unix/Make-arch.orig	2019-08-24 23:13:05.136655180 +0000
++++ tachyon/unix/Make-arch	2019-08-24 23:13:36.057062493 +0000
+@@ -1217,12 +1217,12 @@
+ 	$(MAKE) all \
+ 	"ARCH = linux-64-thr" \
+ 	"CC = gcc" \
+-	"CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
++	"CFLAGS = $(CFLAGS) -DLinux -DLP64 -DTHR -D_REENTRANT $(MISCFLAGS)" \
+ 	"AR = ar" \
+ 	"ARFLAGS = r" \
+ 	"STRIP = strip" \
+ 	"RANLIB = ranlib" \
+-	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread"
++	"LIBS = -L. -ltachyon $(MISCLIB) -lm -lpthread" "LDFLAGS = $(LDFLAGS)"
+ 
+ # Linux x86, on AMD Athlon, using gcc
+ linux-p4: