summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCody P Schafer2018-11-18 12:46:20 -0500
committerCody P Schafer2018-11-18 12:46:42 -0500
commit9c1a05f4bc21a8f825fa3f9e3181e1e612ea4cb7 (patch)
tree4f110337d1feff5282bb241903c5912a3551431b
parent6339915404c31997e3324785483c2b1358c7bb31 (diff)
downloadaur-9c1a05f4bc21a8f825fa3f9e3181e1e612ea4cb7.tar.gz
rework for multilib
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD11
2 files changed, 14 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 81e78e5bcd9d..eb1f4c527346 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = rr
+pkgbase = rr-multilib
pkgdesc = Record and Replay framework: lightweight recording and deterministic debugging
pkgver = 5.2.0
pkgrel = 3
@@ -13,12 +13,16 @@ pkgbase = rr
depends = python2-pexpect
depends = gdb
depends = capnproto
- source = https://github.com/mozilla/rr/archive/5.2.0.tar.gz
+ depends = lib32-gcc-libs
+ provides = rr
+ conflicts = rr
+ replaces = rr
+ source = rr-5.2.0.tar.gz::https://github.com/mozilla/rr/archive/5.2.0.tar.gz
source = https://github.com/mozilla/rr/commit/53c5bd72bae089616a3ca626b8af240481d70e6f.patch
source = file://0001-avoid-overriding-external-opt-debug-flags.patch
sha1sums = 55040be15a87dd93012d7cdbeb8a3fc428ea4b6b
sha1sums = 9fcafcc3f4474b4352402b39002869a51e77f6df
sha1sums = SKIP
-pkgname = rr
+pkgname = rr-multilib
diff --git a/PKGBUILD b/PKGBUILD
index 28018bd5778c..0ed1944de4e4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,20 @@
# Maintainer: dequis <dx@dxzone.com.ar>
# Previous maintainer: Joel Teichroeb <joel@teichroeb.net>
-pkgname=rr
+pkgname=rr-multilib
pkgver=5.2.0
pkgrel=3
pkgdesc='Record and Replay framework: lightweight recording and deterministic debugging'
arch=(i686 x86_64)
url='http://rr-project.org/'
license=('custom')
-depends=('python2-pexpect' 'gdb' 'capnproto')
+conflicts=(rr)
+provides=(rr)
+replaces=(rr)
+depends=('python2-pexpect' 'gdb' 'capnproto' 'lib32-gcc-libs')
makedepends=('git' 'cmake' 'gdb' 'ninja')
source=(
- https://github.com/mozilla/${pkgname}/archive/${pkgver}.tar.gz
+ rr-${pkgver}.tar.gz::https://github.com/mozilla/rr/archive/${pkgver}.tar.gz
https://github.com/mozilla/rr/commit/53c5bd72bae089616a3ca626b8af240481d70e6f.patch
file://0001-avoid-overriding-external-opt-debug-flags.patch
)
@@ -21,6 +24,7 @@ sha1sums=('55040be15a87dd93012d7cdbeb8a3fc428ea4b6b'
'SKIP')
prepare() {
+ mv rr-$pkgver $pkgname-$pkgver
cd $pkgname-$pkgver
mkdir -p build
patch -Np1 -i "$srcdir/53c5bd72bae089616a3ca626b8af240481d70e6f.patch"
@@ -31,7 +35,6 @@ build() {
cd $pkgname-$pkgver/build
cmake \
-GNinja \
- -Ddisable32bit=true \
-DCMAKE_BUILD_TYPE=plain \
-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-DBUILD_TESTS=OFF \