Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updpatch: zcash 5.3.0-2 #2890

Merged
merged 1 commit into from
Aug 9, 2023
Merged

updpatch: zcash 5.3.0-2 #2890

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 26 additions & 23 deletions zcash/riscv64.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,34 @@
diff --git PKGBUILD PKGBUILD
index 4ac622b..cb688b7 100644
--- PKGBUILD
+++ PKGBUILD
@@ -49,7 +49,7 @@ build() {
@@ -21,12 +21,13 @@ sha256sums=('SKIP'
'7b0919ac447824199aff8c17b5a5799b46414818c6aed314506c5295d0ce9ccd')

CPPFLAGS="${CPPFLAGS} -I${srcdir}/db-root/include -I/usr/include/utf8cpp"
LDFLAGS="${LDFLAGS} -L${srcdir}/db-root/lib"
- rust_target=$(RUSTC_BOOTSTRAP=1 rustc -Z unstable-options --print target-spec-json | python -c 'import json,sys;obj=json.load(sys.stdin);print(obj["llvm-target"])')
+ rust_target="riscv64gc-unknown-linux-gnu"
get_rust_target() {
- RUSTC_BOOTSTRAP=1 rustc -Z unstable-options --print target-spec-json | python -c 'import json,sys;obj=json.load(sys.stdin);print(obj["llvm-target"])'
+ echo riscv64gc-unknown-linux-gnu
}

./autogen.sh
./configure --prefix=/usr \
@@ -62,7 +62,7 @@ check() {
build() {
cd "db-${_db_version}/build_unix"

./zcutil/fetch-params.sh
+ cp /usr/share/autoconf/build-aux/config.{guess,sub} ../dist
../dist/configure \
--prefix=/ \
--disable-shared \
@@ -39,11 +40,16 @@ build() {

- rust_target=$(RUSTC_BOOTSTRAP=1 rustc -Z unstable-options --print target-spec-json | python -c 'import json,sys;obj=json.load(sys.stdin);print(obj["llvm-target"])')
+ rust_target="riscv64gc-unknown-linux-gnu"
export RUST_TARGET="${rust_target}"
./qa/zcash/full_test_suite.py || true
}
@@ -70,7 +70,7 @@ check() {
package() {
cd ${pkgname}
cd "${srcdir}/${pkgname}"

- rust_target=$(RUSTC_BOOTSTRAP=1 rustc -Z unstable-options --print target-spec-json | python -c 'import json,sys;obj=json.load(sys.stdin);print(obj["llvm-target"])')
+ rust_target="riscv64gc-unknown-linux-gnu"
make DESTDIR="${pkgdir}" RUST_TARGET="${rust_target}" install
+ echo -e "\n[patch.crates-io]\nring = { git = 'https://github.com/felixonmars/ring', branch = '0.16.20' }" >> Cargo.toml
+ cargo update -p ring
+
CPPFLAGS="${CPPFLAGS} -I${srcdir}/db-root/include -I/usr/include/utf8cpp"
LDFLAGS="${LDFLAGS} -L${srcdir}/db-root/lib"

export CC=/usr/bin/clang
export CXX=/usr/bin/clang++
+ export CFLAGS=${CFLAGS/-fstack-clash-protection}
+ export CXXFLAGS=${CXXFLAGS/-fstack-clash-protection}

for ext in '-cli' '-tx' 'd'; do
./autogen.sh
./configure --prefix=/usr \