Skip to content

Commit cd741e9

Browse files
authored
1 parent 36e6613 commit cd741e9

File tree

5 files changed

+14
-16
lines changed

5 files changed

+14
-16
lines changed

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- run: |
6464
sudo dpkg --add-architecture i386
6565
sudo apt-get update
66-
sudo apt-get install libgcc-s1:i386 g++-multilib zlib1g-dev:i386 libssl-dev:i386
66+
sudo apt-get install libgcc-s1:i386 g++-multilib zlib1g-dev:i386
6767
./scripts/install_byond.sh
6868
6969
- uses: actions-rs/toolchain@v1

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rust-g"
33
edition = "2021"
4-
version = "2.1.0"
4+
version = "3.0.0"
55
authors = [
66
"Bjorn Neergaard <[email protected]>",
77
"Tad Hardesty <[email protected]>",

README.md

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ System libraries:
5151
```sh
5252
sudo dpkg --add-architecture i386
5353
sudo apt-get update
54-
sudo apt-get install zlib1g-dev:i386 libssl-dev:i386
54+
sudo apt-get install zlib1g-dev:i386
5555
```
5656

5757
* Other Linux distributions install the appropriate **32-bit development** and **32-bit runtime** packages.
@@ -84,7 +84,8 @@ cargo build --release --target i686-pc-windows-msvc
8484

8585
If you aren't sharing the binary with other people, consider compiling [targeting your native cpu](https://rust-lang.github.io/packed_simd/perf-guide/target-feature/rustflags.html#target-cpu) for potential performance improvements. You can do this by setting the `RUSTFLAGS` environment variable to `-C target-cpu=native`. For example, in Powershell you would use `$Env:RUSTFLAGS="-C target-cpu=native"`.
8686
87-
To get additional features, pass a list to `--features`, for example `--features hash,url`. To get all features, pass `--all-features`. To disable the default features, pass `--no-default-features`.
87+
To get additional features, pass a list to `--features`, for example `--features hash,url`. To get all features, pass `--features all`. To disable the default features, pass `--no-default-features`.
88+
You can't use `--all-features` because of conflicting `native_tls` and `rustls_tls` features to select the mysql backend.
8889

8990
The default features are:
9091
* acreplace: Aho-Corasick string matching and replacement.
@@ -139,16 +140,13 @@ sample output, but the most important thing is that nothing is listed as
139140

140141
```sh
141142
$ ldd librust_g.so # Linux
142-
linux-gate.so.1 (0xf7f45000)
143-
libssl.so.1.1 => /usr/lib/i386-linux-gnu/libssl.so.1.1 (0xf6c79000)
144-
libcrypto.so.1.1 => /usr/lib/i386-linux-gnu/libcrypto.so.1.1 (0xf69cd000)
145-
libdl.so.2 => /lib/i386-linux-gnu/libdl.so.2 (0xf69c8000)
146-
librt.so.1 => /lib/i386-linux-gnu/librt.so.1 (0xf69be000)
147-
libpthread.so.0 => /lib/i386-linux-gnu/libpthread.so.0 (0xf699f000)
148-
libgcc_s.so.1 => /lib/i386-linux-gnu/libgcc_s.so.1 (0xf6981000)
149-
libc.so.6 => /lib/i386-linux-gnu/libc.so.6 (0xf67a5000)
150-
/lib/ld-linux.so.2 (0xf7f47000)
151-
libm.so.6 => /lib/i386-linux-gnu/libm.so.6 (0xf66a3000)
143+
linux-gate.so.1 (0xf7f8b000)
144+
libgcc_s.so.1 => /lib/i386-linux-gnu/libgcc_s.so.1 (0xf7957000)
145+
libpthread.so.0 => /lib/i386-linux-gnu/libpthread.so.0 (0xf7935000)
146+
libm.so.6 => /lib/i386-linux-gnu/libm.so.6 (0xf7831000)
147+
libdl.so.2 => /lib/i386-linux-gnu/libdl.so.2 (0xf782b000)
148+
libc.so.6 => /lib/i386-linux-gnu/libc.so.6 (0xf7643000)
149+
/lib/ld-linux.so.2 (0xf7f8d000)
152150
```
153151

154152
If BYOND cannot find the shared library, ensure that the directory containing

docker/Dockerfile.i686-unknown-linux-gnu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ FROM rustembedded/cross:i686-unknown-linux-gnu
22

33
RUN dpkg --add-architecture i386 && \
44
apt-get update && \
5-
apt-get install --assume-yes zlib1g-dev:i386 libssl-dev:i386 pkg-config:i386
5+
apt-get install --assume-yes zlib1g-dev:i386 pkg-config:i386

0 commit comments

Comments
 (0)