From d3454dbd9abce42a0fceda5146cd6dc0ce171ccd Mon Sep 17 00:00:00 2001 From: zonyitoo Date: Fri, 28 Jan 2022 09:54:10 +0800 Subject: [PATCH] enable armv8,neon for build scripts --- Dockerfile | 4 ++-- Makefile | 2 +- homebrew/shadowsocks-rust.rb | 2 +- snap/snapcraft.yaml | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9511c775..ee310e3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /root/shadowsocks-rust ADD . . -RUN rustup install "$(cat rust-toolchain)" && \ +RUN rustup install nightly && \ case "$TARGETARCH" in \ "386") \ RUST_TARGET="i686-unknown-linux-musl" \ @@ -30,7 +30,7 @@ RUN rustup install "$(cat rust-toolchain)" && \ wget -qO- "https://musl.cc/$MUSL-cross.tgz" | tar -xzC /root/ && \ CC=/root/$MUSL-cross/bin/$MUSL-gcc && \ rustup target add $RUST_TARGET && \ - RUSTFLAGS="-C linker=$CC" CC=$CC cargo build --target $RUST_TARGET --release && \ + RUSTFLAGS="-C linker=$CC" CC=$CC cargo build --target "$RUST_TARGET" --release --features "local-tun local-redir armv8 neon" && \ mv target/$RUST_TARGET/release/ss* target/release/ FROM alpine:3.14 AS sslocal diff --git a/Makefile b/Makefile index 0b7ba13a..a684ac66 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ all: build build: ifeq (${TARGET}, release) - cargo build --release + cargo build --release --features "local-tun local-redir armv8 neon" else cargo build endif diff --git a/homebrew/shadowsocks-rust.rb b/homebrew/shadowsocks-rust.rb index d9f15a13..3aabd4fe 100644 --- a/homebrew/shadowsocks-rust.rb +++ b/homebrew/shadowsocks-rust.rb @@ -15,7 +15,7 @@ class ShadowsocksRust < Formula def install ENV.with_build_environment do ENV["RUSTFLAGS"] = "-C target-cpu=native" - system "cargo", "install", *std_cargo_args + system "cargo", "install", *std_cargo_args, "--features", "local-tun local-redir" end end diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 1cc5d504..4c5bb74f 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -43,6 +43,8 @@ parts: shadowsocks-rust: plugin: rust source: https://github.com/shadowsocks/shadowsocks-rust.git + rust-channel: nightly + rust-features: [local-tun, local-redir, armv8, neon] override-pull: | snapcraftctl pull snapcraftctl set-version `git describe --tags --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'`