Skip to content

Commit 10e819c

Browse files
committed
Drop Fedora version to 25.
1 parent e34a7fb commit 10e819c

File tree

6 files changed

+16
-21
lines changed

6 files changed

+16
-21
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ Changes:
3333

3434
* Now using the native version of Psych.
3535

36+
* The supported version of Fedora has been dropped to 25, and the supported
37+
version of LLVM to 3.8, due to LLVM incompatibilities. The instructions for
38+
installing `libssl` have changed to match.
39+
3640
# 0.33, April 2018
3741

3842
New features:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ TruffleRuby is actively tested on these systems:
8686

8787
* Oracle Linux 7
8888
* Ubuntu 16.04 LTS
89-
* Fedora 26
89+
* Fedora 25
9090
* macOS 10.13
9191

9292
You need to [install LLVM](doc/user/installing-llvm.md) to build and run C

doc/user/installing-libssl.md

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,9 @@ install `openssl-devel`:
3131
sudo dnf install openssl-devel
3232
```
3333

34-
However, on Fedora 26 or more recent, the default openssl is 1.1.0 which is too
35-
recent. A workaround is to install the compatibility openssl 1.0.
36-
37-
```
38-
# Make sure the 1.1.0 headers are not installed as they would conflict
39-
sudo dnf remove openssl-devel
40-
# Install openssl 1.0
41-
sudo dnf install compat-openssl10-devel
42-
```
43-
44-
We recommend `compat-openssl10-devel` instead of `compat-openssl10`, because the
45-
latter doesn't seem to put the shared library in a place where we can find it.
34+
We recommend `openssl-devel` instead of `openssl`, even though we aren't using
35+
it for development because the latter doesn't seem to put the shared library in
36+
a place where we can find it.
4637

4738
## macOS
4839

doc/user/installing-llvm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ installing `libc++` seems to introduce some system conflicts.
4848

4949
## Fedora
5050

51-
The tested version of LLVM for Fedora is 4.0.1.
51+
The tested version of LLVM for Fedora is 3.8.
5252

5353
For building C extensions you need to install:
5454

test/truffle/docker/fedora/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM fedora:26
1+
FROM fedora:25
22

33
44

55
# We need a conventional locale for testing
66
ENV LANG=en_US.UTF-8
77

8-
# Dependencies for using openssl (compat-openssl10-devel so we get the /usr/lib64/libssl.so symlink)
9-
RUN dnf install -y compat-openssl10-devel
8+
# Dependencies for using openssl
9+
RUN dnf install -y openssl-devel
1010

1111
# Dependencies for building C extensions
1212
RUN dnf install -y clang llvm

tool/docker/fedora/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM fedora:26
1+
FROM fedora:25
22

33
44

@@ -12,10 +12,10 @@ RUN dnf install -y git
1212
RUN dnf install -y java-1.8.0-openjdk-devel java-1.8.0-openjdk-openjfx java-atk-wrapper
1313

1414
# Other dependencies for building a JDK
15-
RUN dnf install -y gcc libstdc++-static
15+
RUN dnf install -y make gcc libstdc++-static
1616

17-
# Dependencies for using openssl (compat-openssl10-devel so we get the /usr/lib64/libssl.so symlink)
18-
RUN dnf install -y compat-openssl10-devel
17+
# Dependencies for using openssl
18+
RUN dnf install -y openssl-devel
1919

2020
# Dependencies for building C extensions
2121
RUN dnf install -y clang llvm

0 commit comments

Comments
 (0)