Fix install following plasma-umass/coz@11e868ee3ce8e76d811ca7f97f82dfc00e79af98

3 files changed, 11 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7657d7ad447f..886d7c551975 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = coz-git
 	pkgdesc = a new kind of profiler that measures optimization potential
-	pkgver = r246.479a3c1
-	pkgrel = 2
+	pkgver = r258.11e868e
+	pkgrel = 1
 	url = https://github.com/plasma-umass/coz
 	arch = x86_64
 	license = BSD
@@ -9,9 +9,7 @@ pkgbase = coz-git
 	depends = python
 	depends = clang>=3.1
 	source = coz-git::git+https://github.com/plasma-umass/coz.git
-	source = fix-preload-path.patch
 	md5sums = SKIP
-	md5sums = 273946cb7d19ad5697c68893b312cd64
 
 pkgname = coz-git
 
diff --git a/PKGBUILD b/PKGBUILD
index cc627cbfc870..841fb50186b3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jon Gjengset <jon@thesquareplanet.com>
 pkgname=coz-git
-pkgver=r246.479a3c1
-pkgrel=2
+pkgver=r258.11e868e
+pkgrel=1
 pkgdesc="a new kind of profiler that measures optimization potential"
 arch=('x86_64')
 url="https://github.com/plasma-umass/coz"
@@ -10,8 +10,8 @@ depends=('python' 'clang>=3.1')
 makedepends=('git')
 options=()
 install=
-source=('coz-git::git+https://github.com/plasma-umass/coz.git' 'fix-preload-path.patch')
-md5sums=('SKIP' '273946cb7d19ad5697c68893b312cd64')
+source=('coz-git::git+https://github.com/plasma-umass/coz.git')
+md5sums=('SKIP')
 
 pkgver() {
   cd "$srcdir/$pkgname"
@@ -20,19 +20,19 @@ pkgver() {
 
 prepare() {
   cd "$srcdir/$pkgname"
-  msg2 "Fix LD_PRELOAD path set by coz wrapper"
-  patch -Np1 < "$srcdir/fix-preload-path.patch"
 }
 
 build() {
   cd "$srcdir/$pkgname"
-  make
+  make -C libcoz
 }
 
 package() {
   cd "$srcdir/$pkgname"
-  install -Dm755 "$srcdir/$pkgname/coz" "$pkgdir/usr/bin/coz"
-  install -Dm644 "$srcdir/$pkgname/libcoz/libcoz.so" "$pkgdir/usr/share/coz/libcoz.so"
+  install -Dm755 "$srcdir/$pkgname/coz" "$pkgdir/usr/share/coz/coz"
+  install -d "$pkgdir/usr/bin"
+  ln -sfn "/usr/share/coz/coz" "$pkgdir/usr/bin"
+  install -Dm644 "$srcdir/$pkgname/libcoz/libcoz.so" "$pkgdir/usr/share/coz/libcoz/libcoz.so"
   install -Dm644 "$srcdir/$pkgname/include/coz.h" "$pkgdir/usr/include/coz.h"
 }
 
diff --git a/fix-preload-path.patch b/fix-preload-path.patch
deleted file mode 100644
index 0e264ceee95e..000000000000
--- a/fix-preload-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/coz b/coz
-index 7e9a1ff..2a1e3b4 100755
---- a/coz
-+++ b/coz
-@@ -34,8 +34,7 @@ def _coz_run(args):
-     exit(1)
- 
-   env = copy.deepcopy(os.environ)
--  coz_prefix = dirname(dirname(abspath(sys.argv[0])))
--  coz_runtime = coz_prefix + path_sep + 'coz' + path_sep + 'libcoz' + path_sep + 'libcoz.so'
-+  coz_runtime = '/usr/share/coz/libcoz.so'
- 
-   if 'LD_PRELOAD' in env:
-     env['LD_PRELOAD'] += ':' + coz_runtime