diff options
| author | Markus Richter | 2019-09-14 00:02:46 +0200 |
|---|---|---|
| committer | Markus Richter | 2019-09-14 00:02:46 +0200 |
| commit | 6b9c4240ce809c0585ae068b6ca44bc13f0ef376 (patch) | |
| tree | 19103fab37aa3d126492bfaac96ea9994ee2a6de | |
| parent | 986abc073d016c6acbc69b085c4a150e9012386a (diff) | |
| download | aur-6b9c4240ce809c0585ae068b6ca44bc13f0ef376.tar.gz | |
Fix ARM build issues
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 0002-Rollback-ARM-Toolchain.patch | 7 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
3 files changed, 20 insertions, 3 deletions
@@ -1,7 +1,7 @@ pkgbase = bitwarden_rs pkgdesc = An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Does NOT include the web-interface. pkgver = 1.10.0 - pkgrel = 2 + pkgrel = 3 url = https://github.com/dani-garcia/bitwarden_rs install = bitwarden_rs.install arch = i686 @@ -24,6 +24,8 @@ pkgbase = bitwarden_rs sha512sums = 399e63002acb764895bbcf3b983642c8858343b36909eeeb73133de1a9740a3d81232bc206ff6bf3daed50f72354c5e6fd5314d0d044acd9f1cb23a933b1dd74 sha512sums = 4ce188956f6fe7cfdb711b1505f6344ed2775751ea112a0506dc96455c2705ab8529ec442e4747d7810fc3535b4ca78d1864e874dab5b5306373587097e02658 sha512sums = a6f2361c7aa83e63b9a557500406b0cd660e0d7f8b16345f859faa3f96e22bdcecd7589711960486fa0401896291f7d46f66882744c69117fc146056f4a49028 + source_armv7h = 0002-Rollback-ARM-Toolchain.patch + sha512sums_armv7h = 3246620e87cfd37b54b9916eea7fe5ac9a0c8d1066dbd84fe7e5a3ea4daf4a1295fc8dcc3dea7841ac0d1dec839f7119f0fc963c3782361dbdefa9b86193f5f1 pkgname = bitwarden_rs diff --git a/0002-Rollback-ARM-Toolchain.patch b/0002-Rollback-ARM-Toolchain.patch new file mode 100644 index 000000000000..6537033d71af --- /dev/null +++ b/0002-Rollback-ARM-Toolchain.patch @@ -0,0 +1,7 @@ +diff --git a/rust-toolchain b/rust-toolchain +index 3f7cead..2ad2d88 100644 +--- a/rust-toolchain ++++ b/rust-toolchain +@@ -1 +1 @@ +-nightly-2019-08-18 ++nightly-2019-05-11 @@ -3,7 +3,7 @@ pkgname=bitwarden_rs _pkgbase=bitwarden_rs pkgver=1.10.0 -pkgrel=2 +pkgrel=3 pkgdesc="An unofficial lightweight implementation of the bitwarden-server using rust and sqlite. Does NOT include the web-interface." arch=('i686' 'x86_64' 'armv7h' 'aarch64') url="https://github.com/dani-garcia/bitwarden_rs" @@ -11,23 +11,31 @@ license=('GPL3') depends=('openssl') makedepends=('rust-nightly' 'cargo-nightly') optdepends=("bitwarden_rs-vault: Web Interface 'Vault'") -conflicts=("${_pkgbase}-git" "${_pkgbase}-mysql") +conflicts=("${_pkgbase}-git" "${_pkgbase}-mysql") backup=('etc/bitwarden_rs.env') install=bitwarden_rs.install source=("https://github.com/dani-garcia/bitwarden_rs/archive/$pkgver.tar.gz" "${_pkgbase}.install" "${_pkgbase}.service" "0001-Disable-Vault.patch") +source_armv7h=("0002-Rollback-ARM-Toolchain.patch") sha512sums=('3744f3d01affa7b818c12991c74d7c073849a193838376a4d7f49fa1926d2d6d1309b2371bd4390b8631cc763806a8d03375ca057bf2945c6348d547eedbe2be' '399e63002acb764895bbcf3b983642c8858343b36909eeeb73133de1a9740a3d81232bc206ff6bf3daed50f72354c5e6fd5314d0d044acd9f1cb23a933b1dd74' '4ce188956f6fe7cfdb711b1505f6344ed2775751ea112a0506dc96455c2705ab8529ec442e4747d7810fc3535b4ca78d1864e874dab5b5306373587097e02658' 'a6f2361c7aa83e63b9a557500406b0cd660e0d7f8b16345f859faa3f96e22bdcecd7589711960486fa0401896291f7d46f66882744c69117fc146056f4a49028') +sha512sums_armv7h=('3246620e87cfd37b54b9916eea7fe5ac9a0c8d1066dbd84fe7e5a3ea4daf4a1295fc8dcc3dea7841ac0d1dec839f7119f0fc963c3782361dbdefa9b86193f5f1') _src="$pkgname-$pkgver" build() { #build bitwarden_rs cd "$srcdir/$_src" patch -N -p1 -i "$srcdir/0001-Disable-Vault.patch" + + if [ -e "$srcdir/0002-Rollback-ARM-Toolchain.patch" ] ;then + # workaround for armv7h bug: https://github.com/rust-lang/rust/issues/62896 + patch -N -p1 -i "$srcdir/0002-Rollback-ARM-Toolchain.patch" + fi + cargo build --release --features sqlite } |