Make position-independent code.

author: Eric Berquist 2015-07-24 21:00:54 -0400
committer: Eric Berquist 2015-07-24 21:00:54 -0400
commit: 37d4fb3b7246635cbb749868a9f3531278d31ff4 (patch)
tree: 1136ffb00414aad350c2ab721f01c34301d30296
parent: a0161ece36e77a39dca1a76caf19c7490931fdff (diff)
download: aur-37d4fb3b7246635cbb749868a9f3531278d31ff4.tar.gz
4 files changed, 72 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index abff4c0ba5d2..ce601a244121 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = tachyon-opengl
 	pkgdesc = Parallel ray tracer (used as part of Visual Molecular Dynamics), OpenGL-enabled
 	pkgver = 0.99b6
-	pkgrel = 1
+	pkgrel = 2
 	url = http://jedi.ks.uiuc.edu/~johns/raytracer/
 	arch = i686
 	arch = x86_64
@@ -12,9 +12,11 @@ pkgbase = tachyon-opengl
 	conflicts = tachyon
 	options = staticlibs
 	source = http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.99b6/tachyon-0.99b6.tar.gz
-	source = enable-jpeg-png.patch
+	source = make_arch.patch
+	source = make_config.patch
 	sha256sums = f4dcaf9c76a4f49310f56254390f9611c22e353947a1745a8c623e8bc8119b97
-	sha256sums = ecd6ab6274879e0f971e2eba17871fffe2e24dcc9a332013a0b100ee4857cc2c
+	sha256sums = 935553f4a0553505dc4db9c22635072d9cf238988e1dbeee2df52a01e0953a1a
+	sha256sums = c016bb5b0bc422c11bf53e93f7f9001fd742a53ab3d49affd1354bc3990391b3
 
 pkgname = tachyon-opengl
 
diff --git a/PKGBUILD b/PKGBUILD
index 10dca2878618..49e8c300d144 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=tachyon-opengl
 _pkgname=tachyon
 pkgver=0.99b6
-pkgrel=1
+pkgrel=2
 pkgdesc="Parallel ray tracer (used as part of Visual Molecular Dynamics), OpenGL-enabled"
 arch=('i686' 'x86_64')
 url="http://jedi.ks.uiuc.edu/~johns/raytracer/"
@@ -14,9 +14,11 @@ depends=('libgl' 'libjpeg' 'libpng')
 conflicts=('tachyon')
 options=(staticlibs)
 source=("http://jedi.ks.uiuc.edu/~johns/raytracer/files/${pkgver}/${_pkgname}-${pkgver}.tar.gz"
-       "enable-jpeg-png.patch")
+        "make_arch.patch"
+        "make_config.patch")
 sha256sums=('f4dcaf9c76a4f49310f56254390f9611c22e353947a1745a8c623e8bc8119b97'
-            'ecd6ab6274879e0f971e2eba17871fffe2e24dcc9a332013a0b100ee4857cc2c')
+            '935553f4a0553505dc4db9c22635072d9cf238988e1dbeee2df52a01e0953a1a'
+            'c016bb5b0bc422c11bf53e93f7f9001fd742a53ab3d49affd1354bc3990391b3')
 
 case "$CARCH" in
   "i686") _buildtype=linux-thr-ogl ;;
@@ -24,36 +26,37 @@ case "$CARCH" in
 esac
 
 prepare() {
-  cd ${_pkgname}
-  # enable JPEG and PNG support
-  patch -p0 -i ${srcdir}/enable-jpeg-png.patch
+  cd "${srcdir}/${_pkgname}/unix"
+  # generate position-independent code
+  patch -i "${srcdir}/make_arch.patch"
+  # enable JPEG and PNG support, plus GCC atomics
+  patch -i "${srcdir}/make_config.patch"
 }
 
 build() {
   cd "${srcdir}/${_pkgname}/unix"
-  sed -i "s|THREADSFLAGS=-DTHR -DUSEATOMICBARRIERS|THREADSFLAGS=-DTHR -DUSEATOMICBARRIERS -DUSEGCCATOMICS|g" Make-config
   make ${_buildtype}
 }
 
 package() {
   # binary and library
-  cd ${srcdir}/${_pkgname}/compile/${_buildtype}
-  install -D -m 755 tachyon ${pkgdir}/usr/bin/tachyon
-  install -D -m 644 libtachyon.a ${pkgdir}/usr/lib/libtachyon.a
+  cd "${srcdir}/${_pkgname}/compile/${_buildtype}"
+  install -D -m 755 tachyon "${pkgdir}/usr/bin/tachyon"
+  install -D -m 644 libtachyon.a "${pkgdir}/usr/lib/libtachyon.a"
 
   # headers
-  cd ${srcdir}/${_pkgname}/src
-  install -d ${pkgdir}/usr/include/tachyon
-  install -m 644 *.h ${pkgdir}/usr/include/tachyon
+  cd "${srcdir}/${_pkgname}/src"
+  install -d "${pkgdir}/usr/include/tachyon"
+  install -m 644 *.h "${pkgdir}/usr/include/tachyon"
 
   # scenes
-  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
+  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"
 
   # license
-  cd ${srcdir}/${_pkgname}
-  install -D -m 644 Copyright ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  cd "${srcdir}/${_pkgname}"
+  install -D -m 644 Copyright "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
       
diff --git a/make_arch.patch b/make_arch.patch
new file mode 100644
index 000000000000..3d22528bbd37
--- /dev/null
+++ b/make_arch.patch
@@ -0,0 +1,22 @@
+diff --git a/unix/Make-arch b/unix/Make-arch
+index 1044370..7dfd608 100644
+--- a/unix/Make-arch
++++ b/unix/Make-arch
+@@ -1376,7 +1376,7 @@ linux-thr-ogl:
+ 	$(MAKE) all \
+ 	"ARCH = linux-thr-ogl" \
+ 	"CC = cc" \
+-	"CFLAGS = -m32 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
++	"CFLAGS = -m32 -fPIC -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
+ 	"AR = ar" \
+ 	"ARFLAGS = r" \
+ 	"STRIP = touch" \
+@@ -1387,7 +1387,7 @@ linux-64-thr-ogl:
+ 	$(MAKE) all \
+ 	"ARCH = linux-64-thr-ogl" \
+ 	"CC = cc" \
+-	"CFLAGS = -m64 -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
++	"CFLAGS = -m64 -fPIC -Wall -O3 -fomit-frame-pointer -ffast-math -DLinux $(THREADSFLAGS) -D_REENTRANT $(MISCFLAGS) -DUSEOPENGL $(LINUX_GLX_INCS)" \
+ 	"AR = ar" \
+ 	"ARFLAGS = r" \
+ 	"STRIP = touch" \
diff --git a/enable-jpeg-png.patch b/make_config.patch
index f63cbc4bde77..c5e31d777fff 100644
--- a/enable-jpeg-png.patch
+++ b/make_config.patch
@@ -1,15 +1,28 @@
---- unix/Make-config.orig	2015-01-08 20:45:17.968890865 +0100
-+++ unix/Make-config	2015-01-08 20:46:16.223075085 +0100
-@@ -108,14 +108,14 @@
+diff --git a/unix/Make-config b/unix/Make-config
+index 7635748..9492e49 100644
+--- a/unix/Make-config
++++ b/unix/Make-config
+@@ -69,8 +69,8 @@ X11LIB= -lX11
+ #
+ ##########################################################################
+ #THREADSFLAGS=-DTHR
+-THREADSFLAGS=-DTHR -DUSEATOMICBARRIERS
+-#THREADSFLAGS=-DTHR -DUSEATOMICBARRIERS -DUSEGCCATOMICS
++# THREADSFLAGS=-DTHR -DUSEATOMICBARRIERS
++THREADSFLAGS=-DTHR -DUSEATOMICBARRIERS -DUSEGCCATOMICS
+ #THREADSFLAGS=-DTHR -DUSEATOMICBARRIERS -DUSEPHYSCPUCOUNT
+ 
+ 
+@@ -166,14 +166,14 @@ MBOX=
  #   http://www.ijg.org/files/
  ##########################################################################
  # Uncomment the following lines to disable JPEG support
 -USEJPEG=
 -JPEGINC=
 -JPEGLIB=
-+#USEJPEG=
-+#JPEGINC=
-+#JPEGLIB=
++# USEJPEG=
++# JPEGINC=
++# JPEGLIB=
  
  # Uncomment the following lines to enable JPEG support
 -#USEJPEG= -DUSEJPEG
@@ -21,16 +34,16 @@
  
  
  ##########################################################################
-@@ -128,14 +128,14 @@
+@@ -186,14 +186,14 @@ JPEGLIB=
  #   http://www.libpng.org/
  ##########################################################################
  # Uncomment the following lines to disable PNG support
 -USEPNG=
 -PNGINC=
 -PNGLIB=
-+#USEPNG=
-+#PNGINC=
-+#PNGLIB=
++# USEPNG=
++# PNGINC=
++# PNGLIB=
  
  # Uncomment the following lines to enable PNG support
 -#USEPNG= -DUSEPNG
author	Eric Berquist	2015-07-24 21:00:54 -0400
committer	Eric Berquist	2015-07-24 21:00:54 -0400
commit	37d4fb3b7246635cbb749868a9f3531278d31ff4 (patch)
tree	1136ffb00414aad350c2ab721f01c34301d30296
parent	a0161ece36e77a39dca1a76caf19c7490931fdff (diff)
download	aur-37d4fb3b7246635cbb749868a9f3531278d31ff4.tar.gz