Skip to content

Commit

Permalink
Auto merge of #113986 - MaskRay:freebsd, r=nikic
Browse files Browse the repository at this point in the history
ci: Update FreeBSD and illumos binutils to 2.40

The current old 2.25 seems to cause trouble to #106511.

Install texinfo to dist-x86_64-freebsd/Dockerfile like other containers
to fix
```
  MAKEINFO doc/bfd.info
/binutils/binutils-2.40/missing: 81: /binutils/binutils-2.40/missing: makeinfo: not found
WARNING: 'makeinfo' is missing on your system.
```

---

https://www.freshports.org/devel/binutils uses 2.40 for FreeBSD 12.x as well.

`@nikic`
  • Loading branch information
bors committed Aug 23, 2023
2 parents 8105739 + 5ee08a0 commit 3475fa7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/ci/docker/host-x86_64/dist-x86_64-freebsd/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
sudo \
bzip2 \
xz-utils \
texinfo \
wget \
libssl-dev \
pkg-config \
Expand Down
2 changes: 1 addition & 1 deletion src/ci/docker/scripts/freebsd-toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
set -eux

arch=$1
binutils_version=2.25.1
binutils_version=2.40
freebsd_version=12.3
triple=$arch-unknown-freebsd12
sysroot=/usr/local/$triple
Expand Down
4 changes: 2 additions & 2 deletions src/ci/docker/scripts/illumos-toolchain.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ SYSROOT_URL='https://github.com/illumos/sysroot/releases/download/'
SYSROOT_URL+="$SYSROOT_VER/$SYSROOT_TAR"
SYSROOT_DIR="$PREFIX/sysroot"

BINUTILS_VERSION='2.25.1'
BINUTILS_SUM='b5b14added7d78a8d1ca70b5cb75fef57ce2197264f4f5835326b0df22ac9f22'
BINUTILS_VERSION='2.40'
BINUTILS_SUM='f8298eb153a4b37d112e945aa5cb2850040bcf26a3ea65b5a715c83afe05e48a'
BINUTILS_BASE="binutils-$BINUTILS_VERSION"
BINUTILS_TAR="$BINUTILS_BASE.tar.bz2"
BINUTILS_URL="https://ftp.gnu.org/gnu/binutils/$BINUTILS_TAR"
Expand Down

0 comments on commit 3475fa7

Please sign in to comment.