Skip to content

Commit 0b17a0a

Browse files
committed
v1.72.0
osx sdk 13.3 rust 1.72.0 zlib 1.3 libpq 15.4 osxcross a78f48a
1 parent 52483b1 commit 0b17a0a

File tree

4 files changed

+29
-27
lines changed

4 files changed

+29
-27
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ RUN set -eux \
132132

133133

134134
# libpq - https://ftp.postgresql.org/pub/source/
135-
ARG POSTGRESQL_VERSION=15.3
135+
ARG POSTGRESQL_VERSION=15.4
136136

137137
RUN set -eux \
138138
&& echo "Building libpq ${POSTGRESQL_VERSION}..." \
@@ -169,12 +169,12 @@ ENV X86_64_UNKNOWN_LINUX_MUSL_OPENSSL_DIR=/usr/local/musl/ \
169169

170170

171171
# Mac OS X SDK version - https://github.com/joseluisq/macosx-sdks
172-
ARG OSX_SDK_VERSION=13.1
173-
ARG OSX_SDK_SUM=efa167d0e463e40f9a3f3e95a2d4f265552834442872341d5669d3264ba9b702
172+
ARG OSX_SDK_VERSION=13.3
173+
ARG OSX_SDK_SUM=518e35eae6039b3f64e8025f4525c1c43786cc5cf39459d609852faf091e34be
174174
ARG OSX_VERSION_MIN=10.14
175175

176176
# OS X Cross - https://github.com/tpoechtrager/osxcross
177-
ARG OSX_CROSS_COMMIT=564e2b9aa8e7a40da663d890c0e853a1259ff8b1
177+
ARG OSX_CROSS_COMMIT=a78f48ae2ae5c1b2d968d386e59f691d7a331b11
178178

179179
# Install OS X Cross
180180
# A Mac OS X cross toolchain for Linux, FreeBSD, OpenBSD and Android

README.md

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Below are the default toolchains included in the Docker image.
4545
docker run --rm \
4646
--volume "${PWD}/sample":/root/src \
4747
--workdir /root/src \
48-
joseluisq/rust-linux-darwin-builder:1.71.1 \
48+
joseluisq/rust-linux-darwin-builder:1.72.0 \
4949
sh -c "cargo build --release --target x86_64-unknown-linux-musl"
5050
```
5151

@@ -55,7 +55,7 @@ docker run --rm \
5555
docker run --rm \
5656
--volume "${PWD}/sample":/root/src \
5757
--workdir /root/src \
58-
joseluisq/rust-linux-darwin-builder:1.71.1 \
58+
joseluisq/rust-linux-darwin-builder:1.72.0 \
5959
sh -c "cargo build --release --target x86_64-unknown-linux-gnu"
6060
```
6161

@@ -65,7 +65,7 @@ docker run --rm \
6565
docker run --rm \
6666
--volume "${PWD}/sample":/root/src \
6767
--workdir /root/src \
68-
joseluisq/rust-linux-darwin-builder:1.71.1 \
68+
joseluisq/rust-linux-darwin-builder:1.72.0 \
6969
sh -c "cargo build --release --target x86_64-apple-darwin"
7070
```
7171

@@ -77,7 +77,7 @@ docker run --rm \
7777
docker run --rm \
7878
--volume "${PWD}/sample":/root/src \
7979
--workdir /root/src \
80-
joseluisq/rust-linux-darwin-builder:1.71.1 \
80+
joseluisq/rust-linux-darwin-builder:1.72.0 \
8181
sh -c "cargo build --release --target aarch64-unknown-linux-gnu"
8282
```
8383

@@ -87,7 +87,7 @@ docker run --rm \
8787
docker run --rm \
8888
--volume "${PWD}/sample":/root/src \
8989
--workdir /root/src \
90-
joseluisq/rust-linux-darwin-builder:1.71.1 \
90+
joseluisq/rust-linux-darwin-builder:1.72.0 \
9191
sh -c "cargo build --release --target aarch64-unknown-linux-musl"
9292
```
9393

@@ -97,7 +97,7 @@ docker run --rm \
9797
docker run --rm \
9898
--volume "${PWD}/sample":/root/src \
9999
--workdir /root/src \
100-
joseluisq/rust-linux-darwin-builder:1.71.1 \
100+
joseluisq/rust-linux-darwin-builder:1.72.0 \
101101
sh -c "cargo build --release --target aarch64-apple-darwin"
102102
```
103103

@@ -110,7 +110,7 @@ It's known that the [`CARGO_HOME`](https://doc.rust-lang.org/cargo/guide/cargo-h
110110
You can also use the image as a base for your Dockerfile:
111111

112112
```Dockerfile
113-
FROM joseluisq/rust-linux-darwin-builder:1.71.1
113+
FROM joseluisq/rust-linux-darwin-builder:1.72.0
114114
```
115115

116116
### OSXCross
@@ -127,14 +127,14 @@ Examples:
127127
```sh
128128
Example usage:
129129

130-
Example 1: CC=o32-clang ./configure --host=i386-apple-darwin22.2
131-
Example 2: CC=i386-apple-darwin22.2-clang ./configure --host=i386-apple-darwin22.2
130+
Example 1: CC=o32-clang ./configure --host=i386-apple-darwin22.4
131+
Example 2: CC=i386-apple-darwin22.4-clang ./configure --host=i386-apple-darwin22.4
132132
Example 3: o64-clang -Wall test.c -o test
133-
Example 4: x86_64-apple-darwin22.2-strip -x test
133+
Example 4: x86_64-apple-darwin22.4-strip -x test
134134

135-
!!! Use aarch64-apple-darwin22.2-* instead of arm64-* when dealing with Automake !!!
136-
!!! CC=aarch64-apple-darwin22.2-clang ./configure --host=aarch64-apple-darwin22.2 !!!
137-
!!! CC="aarch64-apple-darwin22.2-clang -arch arm64e" ./configure --host=aarch64-apple-darwin22.2 !!!
135+
!!! Use aarch64-apple-darwin22.4-* instead of arm64-* when dealing with Automake !!!
136+
!!! CC=aarch64-apple-darwin22.4-clang ./configure --host=aarch64-apple-darwin22.4 !!!
137+
!!! CC="aarch64-apple-darwin22.4-clang -arch arm64e" ./configure --host=aarch64-apple-darwin22.4 !!!
138138
```
139139

140140
### Cross-compilation example
@@ -153,7 +153,7 @@ compile:
153153
@docker run --rm -it \
154154
-v $(PWD):/drone/src \
155155
-w /drone/src \
156-
joseluisq/rust-linux-darwin-builder:1.71.1 \
156+
joseluisq/rust-linux-darwin-builder:1.72.0 \
157157
make cross-compile
158158
.PHONY: compile
159159

@@ -178,12 +178,12 @@ Just run the makefile `compile` target, then you will see two release binaries `
178178
make compile
179179
# 1. Cross compiling example...
180180

181-
# rustc 1.71.1 (eb26296b5 2023-08-03)
181+
# rustc 1.72.0 (5680fa18f 2023-08-23)
182182
# binary: rustc
183-
# commit-hash: eb26296b556cef10fb713a38f3d16b9886080f26
184-
# commit-date: 2023-08-03
183+
# commit-hash: 5680fa18feaa87f3ff04063800aec256c3d4b4be
184+
# commit-date: 2023-08-23
185185
# host: aarch64-unknown-linux-gnu
186-
# release: 1.71.1
186+
# release: 1.72.0
187187
# LLVM version: 16.0.5
188188

189189
# 2. Compiling application (linux-musl x86_64)...
@@ -211,6 +211,8 @@ For example to cross-compile to Macos:
211211
CC=o64-clang \
212212
CXX=o64-clang++ \
213213
cargo build --target x86_64-apple-darwin
214+
# Or
215+
cargo build --target aarch64-apple-darwin
214216
```
215217

216218
### OpenSSL release advice

cargo/config.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ linker = "aarch64-linux-gnu-gcc"
1212
linker = "aarch64-linux-gnu-gcc"
1313

1414
[target.x86_64-apple-darwin]
15-
linker = "x86_64-apple-darwin22.2-clang"
16-
ar = "x86_64-apple-darwin22.2-ar"
15+
linker = "x86_64-apple-darwin22.4-clang"
16+
ar = "x86_64-apple-darwin22.4-ar"
1717

1818
[target.aarch64-apple-darwin]
19-
linker = "arm64e-apple-darwin22.2-clang"
20-
ar = "arm64e-apple-darwin22.2-ar"
19+
linker = "arm64e-apple-darwin22.4-clang"
20+
ar = "arm64e-apple-darwin22.4-ar"

tests/zlib/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ authors = ["Jose Quintana <https://github.com/joseluisq>"]
55
edition = "2021"
66

77
[dependencies]
8-
flate2 = { version = "1.0", features = [ "zlib-default" ]}
8+
flate2 = { version = "1.0", features = [ "zlib-default" ] }
99

1010
[profile.release]
1111
lto = true

0 commit comments

Comments
 (0)