Skip to content

Commit

Permalink
Revert "3.0.0 (#147)"
Browse files Browse the repository at this point in the history
This reverts commit cd741e9.
  • Loading branch information
MrStonedOne committed Aug 2, 2023
1 parent cd741e9 commit 4a68f33
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
- run: |
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install libgcc-s1:i386 g++-multilib zlib1g-dev:i386
sudo apt-get install libgcc-s1:i386 g++-multilib zlib1g-dev:i386 libssl-dev:i386
./scripts/install_byond.sh
- uses: actions-rs/toolchain@v1
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "rust-g"
edition = "2021"
version = "3.0.0"
version = "2.1.0"
authors = [
"Bjorn Neergaard <[email protected]>",
"Tad Hardesty <[email protected]>",
Expand Down
22 changes: 12 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ System libraries:
```sh
sudo dpkg --add-architecture i386
sudo apt-get update
sudo apt-get install zlib1g-dev:i386
sudo apt-get install zlib1g-dev:i386 libssl-dev:i386
```

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

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"`.
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`.
You can't use `--all-features` because of conflicting `native_tls` and `rustls_tls` features to select the mysql backend.
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`.
The default features are:
* acreplace: Aho-Corasick string matching and replacement.
Expand Down Expand Up @@ -140,13 +139,16 @@ sample output, but the most important thing is that nothing is listed as
```sh
$ ldd librust_g.so # Linux
linux-gate.so.1 (0xf7f8b000)
libgcc_s.so.1 => /lib/i386-linux-gnu/libgcc_s.so.1 (0xf7957000)
libpthread.so.0 => /lib/i386-linux-gnu/libpthread.so.0 (0xf7935000)
libm.so.6 => /lib/i386-linux-gnu/libm.so.6 (0xf7831000)
libdl.so.2 => /lib/i386-linux-gnu/libdl.so.2 (0xf782b000)
libc.so.6 => /lib/i386-linux-gnu/libc.so.6 (0xf7643000)
/lib/ld-linux.so.2 (0xf7f8d000)
linux-gate.so.1 (0xf7f45000)
libssl.so.1.1 => /usr/lib/i386-linux-gnu/libssl.so.1.1 (0xf6c79000)
libcrypto.so.1.1 => /usr/lib/i386-linux-gnu/libcrypto.so.1.1 (0xf69cd000)
libdl.so.2 => /lib/i386-linux-gnu/libdl.so.2 (0xf69c8000)
librt.so.1 => /lib/i386-linux-gnu/librt.so.1 (0xf69be000)
libpthread.so.0 => /lib/i386-linux-gnu/libpthread.so.0 (0xf699f000)
libgcc_s.so.1 => /lib/i386-linux-gnu/libgcc_s.so.1 (0xf6981000)
libc.so.6 => /lib/i386-linux-gnu/libc.so.6 (0xf67a5000)
/lib/ld-linux.so.2 (0xf7f47000)
libm.so.6 => /lib/i386-linux-gnu/libm.so.6 (0xf66a3000)
```
If BYOND cannot find the shared library, ensure that the directory containing
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.i686-unknown-linux-gnu
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ FROM rustembedded/cross:i686-unknown-linux-gnu

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

0 comments on commit 4a68f33

Please sign in to comment.