windows crlf, and changed aarch64 to musl
This commit is contained in:
parent
9c75e81e63
commit
aa36c65194
@ -1,14 +1,13 @@
|
||||
[target.x86_64-unknown-linux-musl]
|
||||
linker = "musl-gcc"
|
||||
|
||||
[target.aarch64-unknown-linux-gnu]
|
||||
linker = "aarch64-linux-gnu-gcc"
|
||||
ar = "aarch64-linux-gnu-gcc"
|
||||
strip = { path = "aarch64-linux-gnu-strip" }
|
||||
# ranlib = "aarch64-linux-gnu-ranlib"
|
||||
[target.aarch64-unknown-linux-musl]
|
||||
linker = "aarch64-linux-musl-gcc"
|
||||
ar = "aarch64-linux-musl-gcc"
|
||||
strip = { path = "aarch64-linux-musl-strip" }
|
||||
|
||||
[target.x86_64-pc-windows-gnu]
|
||||
linker = "x86_64-w64-mingw32-gcc"
|
||||
|
||||
# [build]
|
||||
# target = "x86_64-unknown-linux-gnu"
|
||||
# target = "x86_64-unknown-linux-gnu"
|
||||
|
||||
4
.gitattributes
vendored
Normal file
4
.gitattributes
vendored
Normal 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
2
Cargo.lock
generated
@ -2272,7 +2272,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "punchnet"
|
||||
version = "1.2.1"
|
||||
version = "1.2.4"
|
||||
dependencies = [
|
||||
"ahash",
|
||||
"arc-swap",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "punchnet"
|
||||
version = "1.2.1"
|
||||
version = "1.2.4"
|
||||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
|
||||
8
Makefile
8
Makefile
@ -24,8 +24,8 @@ libtun-so-clang:
|
||||
libtun-so:
|
||||
rm libtuntap.* && cd src/network && gcc -fPIC -shared -o libtuntap.so tuntap.c && cp libtuntap.so ../.. && cd -
|
||||
|
||||
libtun-so-aarch64:
|
||||
rm libtuntap.* && cd src/network && aarch64-linux-gnu-gcc -fPIC -shared -o libtuntap.so tuntap.c && cp libtuntap.so ../.. && cd -
|
||||
libtun-aarch64-musl:
|
||||
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:
|
||||
tar -czvf punchnet.tar.gz punchnet punchnet.service libtuntap.so install.sh
|
||||
@ -40,6 +40,6 @@ deb-musl: libtun-musl
|
||||
deb: libtun-so
|
||||
RUSTFLAGS="-L ." cargo deb --deb-revision="1-dynamic"
|
||||
|
||||
deb-aarch64: libtun-so-aarch64
|
||||
RUSTFLAGS="-L ." cargo deb --target aarch64-unknown-linux-gnu
|
||||
deb-aarch64-musl: libtun-aarch64-musl
|
||||
RUSTFLAGS="-L ." cargo deb --target aarch64-unknown-linux-musl --deb-revision="1-static"
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user