Skip to content

Commit 39815d2

Browse files
authored
Merge pull request #277 from bgilbert/binutils
Fix Windows exported symbol check on binutils 2.43; bump builder API version
2 parents 18dc4f3 + a321616 commit 39815d2

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

artifacts/postprocess-binary.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ def library_symbols(file: Path) -> list[str]:
5555
if active:
5656
if not line.strip():
5757
return syms
58-
syms.append(line.split()[2])
58+
sym = line.split()[-1]
59+
if sym != 'Name':
60+
syms.append(sym)
5961
elif 'Ordinal/Name Pointer' in line:
6062
active = True
6163
raise Exception("Couldn't parse objdump output")

bintool

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ from common.meson import (
5050
)
5151
from common.software import Project
5252

53-
WINDOWS_API_VERS = (4,)
53+
WINDOWS_API_VERS = (4, 5)
5454
LINUX_API_VERS = (3,)
5555
# we have a higher minimum than the underlying meson.build
5656
MESON_MIN_VER = (1, 5, 0)

builder/windows/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM docker.io/gentoo/stage3:latest
22
# NOTE: try to keep the current container image compatible with the latest
33
# stable source release, so people can conveniently build from the source
44
# tarball
5-
RUN touch /etc/openslide-winbuild-builder-v{3,4}
5+
RUN touch /etc/openslide-winbuild-builder-v5
66
RUN echo 'FEATURES="-sandbox -usersandbox -ipc-sandbox -network-sandbox -pid-sandbox"' >> /etc/portage/make.conf
77
COPY package.accept_keywords /etc/portage/package.accept_keywords/openslide
88
COPY package.use /etc/portage/package.use/openslide

0 commit comments

Comments
 (0)