summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorJohannes Dewender2015-10-31 16:09:43 +0100
committerJohannes Dewender2015-10-31 16:09:43 +0100
commitdcacc1fe9f2d535bf38d353a0cb5ad6d41ba89fd (patch)
treee1466f6816cf5d2028a9a82580e45dbcb87245d7 /PKGBUILD
parent27cdf788fe43caebcad285c963b797e1b995f895 (diff)
downloadaur-dcacc1fe9f2d535bf38d353a0cb5ad6d41ba89fd.tar.gz
use native libedit, fixes compilation again
Without the change this error occurs: relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD27
1 files changed, 17 insertions, 10 deletions
diff --git a/PKGBUILD b/PKGBUILD
index c0978e88fd9e..48fccf73050f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,22 @@
pkgbase=voglperf
pkgname=('voglperf32' 'voglperf64')
pkgver=0.2
-pkgrel=5
+pkgrel=6
pkgdesc="benchmarking tool for OpenGL games (frame info, logs, steam support)"
arch=('x86_64' 'i686')
url="https://github.com/ValveSoftware/voglperf"
license=('custom:MIT', 'BSD')
-depends=('ncurses')
-makedepends=('cmake')
+makedepends=('cmake' 'ncurses' 'libedit')
if [ "$CARCH" = "x86_64" ]; then
- makedepends+=('gcc-multilib' 'lib32-ncurses')
+ makedepends+=('gcc-multilib' 'lib32-ncurses' 'lib32-libedit')
fi
conflicts=('voglperf')
replaces=('voglperf')
-source=(https://github.com/ValveSoftware/$pkgbase/archive/$pkgver.tar.gz)
-sha256sums=('c91ab58aaa69d84312ce67090252f28a104952d4335595bbc728e357bf2ad545')
+source=(https://github.com/ValveSoftware/$pkgbase/archive/$pkgver.tar.gz
+ multilib-libraries.patch native-libedit.patch)
+sha256sums=('c91ab58aaa69d84312ce67090252f28a104952d4335595bbc728e357bf2ad545'
+ 'fdde9ba59e2d3ae2cf8a0225d007b15732adf271bc283366eff377e762dac66f'
+ '72c2cb961df7466984bb6aab44e03a8e2793c5ba867da12bcba18842a1210c31')
prepare() {
cd "$srcdir/$pkgbase-$pkgver"
@@ -29,10 +31,15 @@ prepare() {
sed -i -e 's|./libvoglperf32.so|/usr/lib/libvoglperf.so|' \
src/voglperfrun.cpp
fi
+
+ # use system libedit
+ patch -p1 < ../multilib-libraries.patch
+ patch -p1 < ../native-libedit.patch
+
# ncurses provides libtinfo functionality
# we don't split ncurses into an extra libtinfo on Arch
# fixed in voglperf > 0.2 (8ea79efa85b8970295ae834eb2e41c00ba18df82)
- sed -i -e 's|tinfo|ncurses|' src/CMakeLists.txt
+ sed -i -e 's|tinfo|ncurses|g' src/CMakeLists.txt
}
build() {
@@ -47,9 +54,9 @@ build() {
package_voglperf32() {
arch=('x86_64' 'i686')
if [ "$CARCH" = "i686" ]; then
- depends=('ncurses')
+ depends=('ncurses' 'libedit')
else
- depends=('lib32-ncurses' 'lib32-gcc-libs')
+ depends=('lib32-ncurses' 'lib32-libedit' 'lib32-gcc-libs')
fi
cd "$srcdir/$pkgbase-$pkgver/bin"
install -D voglperfrun32 "$pkgdir/usr/bin/voglperfrun32"
@@ -69,7 +76,7 @@ package_voglperf32() {
package_voglperf64() {
arch=('x86_64')
- depends=('ncurses' 'gcc-libs-multilib')
+ depends=('ncurses' 'libedit' 'gcc-libs-multilib')
cd "$srcdir/$pkgbase-$pkgver/bin"
install -D voglperfrun64 "$pkgdir/usr/bin/voglperfrun64"
install -Dm644 libvoglperf64.so "$pkgdir/usr/lib/libvoglperf.so"