Use path lookup in LD_PRELOAD for seamless lib32 compat

3 files changed, 10 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b9347e917981..6088027b0d87 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Fri Jan 11 22:46:35 UTC 2019
 pkgbase = ksm_preload-git
 	pkgdesc = Library which allows legacy applications to use Kernel Same-page Merging
-	pkgver = 0.10.8.rfa46b5c
-	pkgrel = 3
+	pkgver = 0.10.9.r459df0e
+	pkgrel = 2
 	url = http://vleu.net/ksm_preload/
 	arch = i686
 	arch = x86_64
@@ -14,7 +12,6 @@ pkgbase = ksm_preload-git
 	source = git+https://github.com/unbrice/ksm_preload.git
 	source = ksm-wrapper
 	sha256sums = SKIP
-	sha256sums = ff95193fae6576bd71a5a1378607e4a44dcd12324201c3dbaffb965f9236b4e2
+	sha256sums = 8f02470b27c1678ad6041e8c6d3d3bac218c54b14cd306d921e806464b4ca5bd
 
 pkgname = ksm_preload-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 92fedd061564..677f3e54774a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Score_Under <seejay.11@gmail.com>
 _pkgname=ksm_preload
 pkgname=$_pkgname-git
-pkgver=0.10.8.rfa46b5c
-pkgrel=3
+pkgver=0.10.9.r459df0e
+pkgrel=2
 pkgdesc='Library which allows legacy applications to use Kernel Same-page Merging'
 url=http://vleu.net/ksm_preload/
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ source=("git+https://github.com/unbrice/$_pkgname.git"
 optdepends=('sh: ksm-wrapper script')
 makedepends=(cmake git)
 sha256sums=('SKIP'
-            'ff95193fae6576bd71a5a1378607e4a44dcd12324201c3dbaffb965f9236b4e2')
+            '8f02470b27c1678ad6041e8c6d3d3bac218c54b14cd306d921e806464b4ca5bd')
 
 cdgit() { cd -- "$_pkgname"; }
 
@@ -28,11 +28,11 @@ pkgver() {
 prepare() {
     cdgit
 
-    # Use (/usr)/lib/ksm_preload rather than (/usr)/share for native
+    # Use (/usr)/lib rather than (/usr)/share/ksm_preload for native
     # libraries, because /usr/share is supposed to be arch-independent...
     # This will still need a little hacking of ksm-wrapper to get it
     # working with lib32 programs too.
-    sed -i.orig 's.\(LIBRARY DESTINATION\) share/.\1 lib/.g' CMakeLists.txt
+    sed -i.orig 's.\(LIBRARY DESTINATION\) share/ksm_preload.\1 lib/.g' CMakeLists.txt
 }
 
 build() {
diff --git a/ksm-wrapper b/ksm-wrapper
index f53ed9824bd5..30980d0c4a2f 100755
--- a/ksm-wrapper
+++ b/ksm-wrapper
@@ -1,6 +1,6 @@
 #!/bin/sh
-# Rewrite of ksm-wrapper to use /usr/lib
-sofile=/usr/lib/ksm_preload/libksm_preload.so
+# Rewrite of ksm-wrapper to use standard lib path
+sofile=libksm_preload.so
 case " $LD_PRELOAD " in
     (*[:\ ]"$sofile"[:\ ]*) ;;
     (*) LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD }$sofile"