Skip to content

Commit 5255c3c

Browse files
committed
Makefile: do not compile rust/download_web with old toolchain
libz-sys crate became incompatible with Alpine 3.13 toolchain (rust 1.47): error: unexpected token: `zng_prefix` --> /root/.cargo/registry/src/jiasu.xzqcsaa.nyc.mn-1ecc6299db9ec823/libz-sys-1.1.8/src/lib.rs:115:19 | 114 | extern "C" { | - while parsing this item list starting here 115 | #[link_name = zng_prefix!(adler32)] | ^^^^^^^^^^ ... 241 | } | - the item list ends here With Alpine 3.14 toolchain (rust 1.52): error[E0658]: arbitrary expressions in key-value attributes are unstable --> /root/.cargo/registry/src/jiasu.xzqcsaa.nyc.mn-1ecc6299db9ec823/libz-sys-1.1.8/src/lib.rs:115:19 | 115 | #[link_name = zng_prefix!(adler32)] | ^^^^^^^^^^^^^^^^^^^^ | = note: see issue #78835 <rust-lang/rust#78835> for more information
1 parent 1ceae3a commit 5255c3c

7 files changed

+16
-11
lines changed

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,17 @@ else
9999
# note: for more information, see https://github.com/rust-lang/rust/issues/62254
100100
# Old versions of rustc (<=1.44) fail to build socket2-0.4.0 because:
101101
# error[E0658]: `match` is not allowed in a `const fn`
102-
# Fnote: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
102+
# note: see issue #49146 <https://github.com/rust-lang/rust/issues/49146> for more information
103103
# Old versions of rustc (<=1.44) fail to build clap-2.33.3 because:
104104
# error[E0723]: loops and conditional expressions are not stable in const fn
105105
# note: for more information, see issue https://github.com/rust-lang/rust/issues/57563
106106
ifeq ($(call can-run,$(RUSTC) --version | grep '^rustc 1\.\(3[0-9]\|4[0-4]\)\.'),y)
107107
SUBDIRS_BLACKLIST += rust/asymkeyfind% rust/check_linux_pass% rust/download_web%
108+
else ifeq ($(call can-run,$(RUSTC) --version | grep '^rustc 1\.\(4[5-9]\|5[0-2]\)\.'),y)
109+
# Old versions of rustc (<=1.52) fail to build libz-sys-1.1.8 because:
110+
# error[E0658]: arbitrary expressions in key-value attributes are unstable
111+
# note: see issue #78835 <https://github.com/rust-lang/rust/issues/78835> for more information
112+
SUBDIRS_BLACKLIST += rust/download_web%
108113
endif
109114
endif
110115

machines/Dockerfile-alpine3.13

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ COPY . /shared/
5252
CMD ["/run_shared_test.sh"]
5353

5454
# make list-nobuild:
55-
# Global blacklist: latex%
55+
# Global blacklist: latex% rust/download_web%
5656
# In sub-directories:
5757
# c: x86-read_64b_regs_in_32b_mode
5858
# glossaries:

machines/Dockerfile-alpine3.14

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ COPY . /shared/
5151
CMD ["/run_shared_test.sh"]
5252

5353
# make list-nobuild:
54-
# Global blacklist: latex%
54+
# Global blacklist: latex% rust/download_web%
5555
# In sub-directories:
5656
# c: x86-read_64b_regs_in_32b_mode
5757
# glossaries:

machines/Dockerfile-debian11-bullseye

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ COPY . /shared/
6262
CMD ["/run_shared_test.sh"]
6363

6464
# make list-nobuild:
65-
# Global blacklist: latex%
65+
# Global blacklist: latex% rust/download_web%
6666
# In sub-directories:
6767
# c:
6868
# glossaries:
@@ -76,7 +76,7 @@ CMD ["/run_shared_test.sh"]
7676
# rust:
7777
# verification:
7878
# With gcc -m32:
79-
# Global blacklist: latex%
79+
# Global blacklist: latex% rust/download_web%
8080
# In sub-directories:
8181
# c: gmp_functions gtk_alpha_window
8282
# glossaries:

machines/Dockerfile-fedora31

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ COPY . /shared/
6565
CMD ["/run_shared_test.sh"]
6666

6767
# make list-nobuild:
68-
# Global blacklist: latex%
68+
# Global blacklist: latex% rust/download_web%
6969
# In sub-directories:
7070
# c:
7171
# glossaries:
@@ -79,7 +79,7 @@ CMD ["/run_shared_test.sh"]
7979
# rust:
8080
# verification:
8181
# With gcc -m32:
82-
# Global blacklist: latex%
82+
# Global blacklist: latex% rust/download_web%
8383
# In sub-directories:
8484
# c: gtk_alpha_window
8585
# glossaries:

machines/Dockerfile-fedora32

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ COPY . /shared/
6565
CMD ["xvfb-run", "/run_shared_test.sh"]
6666

6767
# make list-nobuild:
68-
# Global blacklist: latex%
68+
# Global blacklist: latex% rust/download_web%
6969
# In sub-directories:
7070
# c:
7171
# glossaries:
@@ -79,7 +79,7 @@ CMD ["xvfb-run", "/run_shared_test.sh"]
7979
# rust:
8080
# verification:
8181
# With gcc -m32:
82-
# Global blacklist: latex%
82+
# Global blacklist: latex% rust/download_web%
8383
# In sub-directories:
8484
# c: gtk_alpha_window
8585
# glossaries:

machines/Dockerfile-ubuntu1604-xenial

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ COPY . /shared/
6363
CMD ["/run_shared_test.sh"]
6464

6565
# make list-nobuild:
66-
# Global blacklist: latex%
66+
# Global blacklist: latex% rust/download_web%
6767
# In sub-directories:
6868
# c:
6969
# glossaries: check_sort_order.py
@@ -77,7 +77,7 @@ CMD ["/run_shared_test.sh"]
7777
# rust:
7878
# verification:
7979
# With gcc -m32:
80-
# Global blacklist: latex%
80+
# Global blacklist: latex% rust/download_web%
8181
# In sub-directories:
8282
# c: gmp_functions gtk_alpha_window
8383
# glossaries: check_sort_order.py

0 commit comments

Comments
 (0)