diff options
author | Jon Gjengset | 2015-10-06 19:48:39 -0400 |
---|---|---|
committer | Jon Gjengset | 2015-10-06 19:48:58 -0400 |
commit | 04521296be0519dafcbd3b324c1e719dd8a2a755 (patch) | |
tree | bea669427a06b5371de775f0095916f4c382c020 | |
parent | 7cdbd3104fda2d1ff45d8f7a99dd56f2fb6eda69 (diff) | |
download | aur-04521296be0519dafcbd3b324c1e719dd8a2a755.tar.gz |
Correctly fix LD_PRELOAD
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 10 | ||||
-rw-r--r-- | fix-preload-path.patch | 14 | ||||
-rw-r--r-- | no-force-preload.patch | 13 |
4 files changed, 22 insertions, 19 deletions
@@ -10,10 +10,10 @@ pkgbase = coz-git depends = clang>=3.1 source = coz-git::git+https://github.com/plasma-umass/coz.git source = python2.patch - source = no-force-preload.patch + source = fix-preload-path.patch md5sums = SKIP md5sums = f3ff4dcc098eb00e949b362594918517 - md5sums = b7926ac1504babe0b2551983d2d5ed25 + md5sums = 273946cb7d19ad5697c68893b312cd64 pkgname = coz-git @@ -11,10 +11,10 @@ makedepends=('git') options=() install= source=('coz-git::git+https://github.com/plasma-umass/coz.git' - 'python2.patch' 'no-force-preload.patch') + 'python2.patch' 'fix-preload-path.patch') md5sums=('SKIP' 'f3ff4dcc098eb00e949b362594918517' - 'b7926ac1504babe0b2551983d2d5ed25') + '273946cb7d19ad5697c68893b312cd64') pkgver() { cd "$srcdir/$pkgname" @@ -23,8 +23,10 @@ pkgver() { prepare() { cd "$srcdir/$pkgname" + msg2 "Use python2" patch -Np1 < "$srcdir/python2.patch" - patch -Np1 < "$srcdir/no-force-preload.patch" + msg2 "Fix LD_PRELOAD path set by coz wrapper" + patch -Np1 < "$srcdir/fix-preload-path.patch" } build() { @@ -35,7 +37,7 @@ build() { package() { cd "$srcdir/$pkgname" install -Dm755 "$srcdir/$pkgname/coz" "$pkgdir/usr/bin/coz" - install -Dm644 "$srcdir/$pkgname/libcoz/libcoz.so" "$pkgdir/usr/lib/libcoz.so" + install -Dm644 "$srcdir/$pkgname/libcoz/libcoz.so" "$pkgdir/usr/share/coz/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 new file mode 100644 index 000000000000..0e264ceee95e --- /dev/null +++ b/fix-preload-path.patch @@ -0,0 +1,14 @@ +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 diff --git a/no-force-preload.patch b/no-force-preload.patch deleted file mode 100644 index 689c17128f34..000000000000 --- a/no-force-preload.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/coz b/coz -index 7e9a1ff..6e8b259 100755 ---- a/coz -+++ b/coz -@@ -39,8 +39,6 @@ def _coz_run(args): - - if 'LD_PRELOAD' in env: - env['LD_PRELOAD'] += ':' + coz_runtime -- else: -- env['LD_PRELOAD'] = coz_runtime - - if len(args.binary_scope) > 0: - env['COZ_BINARY_SCOPE'] = '\t'.join(args.binary_scope) |