From 183178681d63396da35e637074fd46820e8fabf1 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Sat, 23 Jun 2018 02:15:38 -0700 Subject: [PATCH] Simply fetching perf libs --- build.rs | 1 + snap/snapcraft.yaml | 12 +----------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/build.rs b/build.rs index 844a92dc7e..01a8859533 100644 --- a/build.rs +++ b/build.rs @@ -11,5 +11,6 @@ fn main() { } if !env::var("CARGO_FEATURE_ERASURE").is_err() { println!("cargo:rustc-link-lib=dylib=Jerasure"); + println!("cargo:rustc-link-lib=dylib=gf_complete"); } } diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 33d0578b6e..fc789b6d18 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -45,12 +45,6 @@ apps: command: solana-client-demo parts: - solana-perf-package: - plugin: dump - build-attributes: [no-system-libraries] - source: https://solana-perf.s3.amazonaws.com/master/x86_64-unknown-linux-gnu/solana-perf.tgz - prime: - - solana-perf-HEAD.txt solana-cuda: plugin: rust rust-channel: stable @@ -62,9 +56,7 @@ parts: - usr/lib/libgf_complete.so.1 - usr/lib/libJerasure.so.2 override-build: | - cp -f $SNAPCRAFT_STAGE/libcuda_verify_ed25519.a . - cp -f $SNAPCRAFT_STAGE/libJerasure.so . - cp -f $SNAPCRAFT_STAGE/libgf_complete.so . + ./fetch-perf-libs.sh snapcraftctl build mv $SNAPCRAFT_PART_INSTALL/bin/solana-fullnode $SNAPCRAFT_PART_INSTALL rm -rf $SNAPCRAFT_PART_INSTALL/bin/* @@ -72,8 +64,6 @@ parts: mkdir -p $SNAPCRAFT_PART_INSTALL/usr/lib/ cp -f libJerasure.so $SNAPCRAFT_PART_INSTALL/usr/lib/libJerasure.so.2 cp -f libgf_complete.so $SNAPCRAFT_PART_INSTALL/usr/lib/libgf_complete.so.1 - after: - - solana-perf-package solana: plugin: rust rust-channel: stable