Skip to content

Commit ff0ee27

Browse files
committed
Fix xcb thread panic by allowing x11/xcb symbols
1 parent 12eeb3e commit ff0ee27

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

cpython-unix/build-cpython.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ CFLAGS=${CFLAGS//-fvisibility=hidden/}
288288
# But some symbols from some dependency libraries are still non-hidden for some
289289
# reason. We force the linker to do our bidding.
290290
if [ "${PYBUILD_PLATFORM}" != "macos" ]; then
291-
LDFLAGS="${LDFLAGS} -Wl,--exclude-libs,ALL"
291+
LDFLAGS="${LDFLAGS} -Wl,--exclude-libs,libbz2.so:libcrypto.so:libdb.so:libedit.so:libexpat.so:libffi.so:libformw.so:liblzma.so:libmenuw.so:libmpdec.so:libncursesw.so:libpanelw.so:libsqlite3.so:libssl.so:libtcl8.6.so:libtk8.6.so:libuuid.so:libX11.so:libXau.so:libz.so"
292292
fi
293293

294294
EXTRA_CONFIGURE_FLAGS=

cpython-unix/build-libX11.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ if [ -n "${CROSS_COMPILING}" ]; then
7878
esac
7979
fi
8080

81+
EXTRA_TARGET_CFLAGS="${EXTRA_TARGET_CFLAGS//-fvisibility=hidden/}"
82+
8183
# CC_FOR_BUILD is here because configure doesn't look for `clang` when
8284
# cross-compiling. So we force it.
8385
CFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC -I/tools/deps/include" \

cpython-unix/build-libxcb.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ if [ "${CC}" = "musl-clang" ]; then
1717
EXTRA_FLAGS="--disable-shared"
1818
fi
1919

20+
EXTRA_TARGET_CFLAGS="${EXTRA_TARGET_CFLAGS//-fvisibility=hidden/}"
21+
2022
CFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" CPPFLAGS="${EXTRA_TARGET_CFLAGS} -fPIC" LDFLAGS="${EXTRA_TARGET_LDFLAGS}" ./configure \
2123
--build=${BUILD_TRIPLE} \
2224
--host=${TARGET_TRIPLE} \

0 commit comments

Comments
 (0)