punchnet/sdlan-lib-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

windows crlf, and changed aarch64 to musl

Browse Source
This commit is contained in:
alex 2026-05-11 16:15:48 +08:00
parent 9c75e81e63
commit aa36c65194
5 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.cargo/config.toml
View File

@ -1,14 +1,13 @@
[target.x86_64-unknown-linux-musl] [target.x86_64-unknown-linux-musl]
linker = "musl-gcc" linker = "musl-gcc"
[target.aarch64-unknown-linux-gnu] [target.aarch64-unknown-linux-musl]
linker = "aarch64-linux-gnu-gcc" linker = "aarch64-linux-musl-gcc"
ar = "aarch64-linux-gnu-gcc" ar = "aarch64-linux-musl-gcc"
strip = { path = "aarch64-linux-gnu-strip" } strip = { path = "aarch64-linux-musl-strip" }
# ranlib = "aarch64-linux-gnu-ranlib"
[target.x86_64-pc-windows-gnu] [target.x86_64-pc-windows-gnu]
linker = "x86_64-w64-mingw32-gcc" linker = "x86_64-w64-mingw32-gcc"
# [build] # [build]
# target = "x86_64-unknown-linux-gnu" # target = "x86_64-unknown-linux-gnu"

4
.gitattributes vendored Normal file
View File

@ -0,0 +1,4 @@
debian/postinst text eol=lf
debian/postrm text eol=lf
*.sh text eol=lf
*.service text eol=lf

2
Cargo.lock generated
View File

@ -2272,7 +2272,7 @@ dependencies = [
[[package]] [[package]]
name = "punchnet" name = "punchnet"
version = "1.2.1" version = "1.2.4"
dependencies = [ dependencies = [
"ahash", "ahash",
"arc-swap", "arc-swap",

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "punchnet" name = "punchnet"
version = "1.2.1" version = "1.2.4"
edition = "2021" edition = "2021"
[dependencies] [dependencies]

8
Makefile
View File

@ -24,8 +24,8 @@ libtun-so-clang:
libtun-so: libtun-so:
rm libtuntap.* && cd src/network && gcc -fPIC -shared -o libtuntap.so tuntap.c && cp libtuntap.so ../.. && cd - rm libtuntap.* && cd src/network && gcc -fPIC -shared -o libtuntap.so tuntap.c && cp libtuntap.so ../.. && cd -
libtun-so-aarch64: libtun-aarch64-musl:
rm libtuntap.* && cd src/network && aarch64-linux-gnu-gcc -fPIC -shared -o libtuntap.so tuntap.c && cp libtuntap.so ../.. && cd - rm -rf libtuntap.* && touch libtuntap.so && cd src/network && aarch64-linux-musl-gcc -c tuntap.c -o libtuntap.o && aarch64-linux-musl-ar rcs libtuntap.a libtuntap.o && cp libtuntap.a ../.. && cd -
pack: pack:
tar -czvf punchnet.tar.gz punchnet punchnet.service libtuntap.so install.sh tar -czvf punchnet.tar.gz punchnet punchnet.service libtuntap.so install.sh
@ -40,6 +40,6 @@ deb-musl: libtun-musl
deb: libtun-so deb: libtun-so
RUSTFLAGS="-L ." cargo deb --deb-revision="1-dynamic" RUSTFLAGS="-L ." cargo deb --deb-revision="1-dynamic"
deb-aarch64: libtun-so-aarch64 deb-aarch64-musl: libtun-aarch64-musl
RUSTFLAGS="-L ." cargo deb --target aarch64-unknown-linux-gnu RUSTFLAGS="-L ." cargo deb --target aarch64-unknown-linux-musl --deb-revision="1-static"