Skip to content

Commit

Permalink
builder/windows: bump API version
Browse files Browse the repository at this point in the history
binutils 2.43 is incompatible with older openslide-bin source releases.
We could pin older binutils in the Windows builder container, but that's
probably more backward compatibility glue than we want to maintain here.

Bump the builder API version so older openslide-bin source releases will
fail cleanly.  Have bintool accept both API versions, since the new code
should work with both.

Signed-off-by: Benjamin Gilbert <[email protected]>
  • Loading branch information
bgilbert committed Sep 2, 2024
1 parent 88d1620 commit a321616
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bintool
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ from common.meson import (
)
from common.software import Project

WINDOWS_API_VERS = (4,)
WINDOWS_API_VERS = (4, 5)
LINUX_API_VERS = (3,)
# we have a higher minimum than the underlying meson.build
MESON_MIN_VER = (1, 5, 0)
Expand Down
2 changes: 1 addition & 1 deletion builder/windows/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM docker.io/gentoo/stage3:latest
# NOTE: try to keep the current container image compatible with the latest
# stable source release, so people can conveniently build from the source
# tarball
RUN touch /etc/openslide-winbuild-builder-v{3,4}
RUN touch /etc/openslide-winbuild-builder-v5
RUN echo 'FEATURES="-sandbox -usersandbox -ipc-sandbox -network-sandbox -pid-sandbox"' >> /etc/portage/make.conf
COPY package.accept_keywords /etc/portage/package.accept_keywords/openslide
COPY package.use /etc/portage/package.use/openslide
Expand Down

0 comments on commit a321616

Please sign in to comment.