summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Panteleev2016-09-01 08:58:20 +0000
committerVladimir Panteleev2016-09-01 09:00:39 +0000
commite1dff6c11a950fb3b6c24a93bb5d95e71d6f2c9e (patch)
treeac15f8c21d401c85c6bba17f8e13a4811ba6b121
parent4c68087a3e98b18a7907432b7b7dbcafa799f2af (diff)
downloadaur-e1dff6c11a950fb3b6c24a93bb5d95e71d6f2c9e.tar.gz
Fix library install location; i686 support
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD25
2 files changed, 20 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f0986f86570f..ff602c4d7935 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Wed Aug 31 19:53:23 UTC 2016
+# Thu Sep 1 09:00:27 UTC 2016
pkgbase = hax11-git
pkgdesc = Hackbrary to Hook and Augment X11 protocol calls
pkgver = r83.7214eca
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/CyberShadow/hax11
arch = i686
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 71167fcf0da6..37c0cc660c97 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=hax11-git
pkgver=r83.7214eca
-pkgrel=1
+pkgrel=2
pkgdesc="Hackbrary to Hook and Augment X11 protocol calls"
arch=('i686' 'x86_64')
url="https://github.com/CyberShadow/hax11"
@@ -21,16 +21,27 @@ pkgver() {
build() {
cd "$srcdir/hax11"
- make
+ if [[ $CARCH == x86_64 ]]
+ then
+ make
+ else
+ make lib32/hax11.so
+ fi
}
package() {
# Libraries
- for arch in 32 64
- do
- mkdir -p "$pkgdir/usr/lib/hax11/lib$arch"
- install -m644 -t "$pkgdir/usr/lib/hax11/lib$arch" "$srcdir/hax11/lib$arch/hax11.so"
- done
+ if [[ $CARCH == x86_64 ]]
+ then
+ mkdir -p "$pkgdir/usr/lib/hax11/lib"
+ install -m644 -t "$pkgdir/usr/lib/hax11/lib" "$srcdir/hax11/lib64/hax11.so"
+
+ mkdir -p "$pkgdir/usr/lib/hax11/lib32"
+ install -m644 -t "$pkgdir/usr/lib/hax11/lib32" "$srcdir/hax11/lib32/hax11.so"
+ else
+ mkdir -p "$pkgdir/usr/lib/hax11/lib"
+ install -m644 -t "$pkgdir/usr/lib/hax11/lib" "$srcdir/hax11/lib/hax11.so"
+ fi
# LD_PRELOAD profile.d script
mkdir -p "$pkgdir/etc/profile.d"