Skip to content

Commit 8757696

Browse files
committed
bump to 2.34
1 parent 8a5e2d0 commit 8757696

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

.ci/scripts/wheel/pre_build_script.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ fi
4949

5050
echo "GCC version: $(gcc -dumpfullversion)"
5151

52-
GLIBC_VERSION=2.29
52+
# 👇 only change this line to bump version
53+
GLIBC_VERSION=2.34
54+
5355
PREFIX=/tmp/glibc-install-$GLIBC_VERSION
5456
BUILD_DIR=/tmp/glibc-build
5557
TARBALL=/tmp/glibc-$GLIBC_VERSION.tar.xz
@@ -59,7 +61,7 @@ SRC_DIR=/tmp/glibc-$GLIBC_VERSION
5961
rm -rf "$PREFIX" "$BUILD_DIR" "$SRC_DIR" "$TARBALL"
6062
mkdir -p "$BUILD_DIR"
6163

62-
# Download tarball from canonical GNU FTP (not ftpmirror)
64+
# Download tarball from canonical GNU FTP
6365
MIRROR=https://ftp.gnu.org/gnu/libc
6466
curl -L "$MIRROR/glibc-$GLIBC_VERSION.tar.xz" -o "$TARBALL"
6567

@@ -75,7 +77,7 @@ cd "$BUILD_DIR"
7577
# Unset LD_LIBRARY_PATH to satisfy glibc configure
7678
unset LD_LIBRARY_PATH
7779

78-
# Suppress GCC 13+ warnings that break glibc-2.29
80+
# Suppress GCC 13+ warnings
7981
COMMON_FLAGS="-O2 -fPIC -fcommon \
8082
-Wno-error=array-parameter \
8183
-Wno-error=array-bounds \
@@ -95,7 +97,6 @@ export CPPFLAGS="$COMMON_FLAGS"
9597
--prefix="$PREFIX" \
9698
--without-selinux
9799

98-
# Build and install
99100
# Build and install
100101
make -j"$(nproc)"
101102
make install
@@ -121,13 +122,13 @@ else
121122
echo "libc.so.6 NOT FOUND in $PREFIX/lib"
122123
fi
123124

124-
echo ">>> Checking for ld-2.29.so"
125-
if [ -e "$PREFIX/lib/ld-2.29.so" ]; then
126-
ls -l "$PREFIX/lib/ld-2.29.so"
125+
echo ">>> Checking for ld-$GLIBC_VERSION.so"
126+
if [ -e "$PREFIX/lib/ld-$GLIBC_VERSION.so" ]; then
127+
ls -l "$PREFIX/lib/ld-$GLIBC_VERSION.so"
127128
else
128-
echo "ld-2.29.so NOT FOUND in $PREFIX/lib"
129+
echo "ld-$GLIBC_VERSION.so NOT FOUND in $PREFIX/lib"
129130
fi
130131

131132
# Run version checks only if files exist
132-
[ -x "$PREFIX/lib/ld-2.29.so" ] && "$PREFIX/lib/ld-2.29.so" --version || echo "ld-2.29.so missing or not executable"
133+
[ -x "$PREFIX/lib/ld-$GLIBC_VERSION.so" ] && "$PREFIX/lib/ld-$GLIBC_VERSION.so" --version || echo "ld-$GLIBC_VERSION.so missing or not executable"
133134
[ -x "$PREFIX/lib/libc.so.6" ] && "$PREFIX/lib/libc.so.6" --version || echo "libc.so.6 missing or not executable"

backends/qualcomm/scripts/download_qnn_sdk.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,17 +184,17 @@ def _extract_tar(archive_path: pathlib.Path, prefix: str, target_dir: pathlib.Pa
184184
# libc management
185185
####################
186186

187-
GLIBC_VERSION = "2.29"
187+
GLIBC_VERSION = "2.34"
188188
GLIBC_ROOT = pathlib.Path(f"/tmp/glibc-install-{GLIBC_VERSION}")
189189
GLIBC_LIBDIR = GLIBC_ROOT / "lib"
190190
GLIBC_LOADER_CANDIDATES = [
191-
GLIBC_LIBDIR / "ld-2.29.so",
191+
GLIBC_LIBDIR / f"ld-{GLIBC_VERSION}.so",
192192
GLIBC_LIBDIR / "ld-linux-x86-64.so.2",
193193
]
194194
GLIBC_LOADER = next((p for p in GLIBC_LOADER_CANDIDATES if p.exists()), None)
195195
GLIBC_REEXEC_GUARD = "QNN_GLIBC_REEXEC"
196196

197-
MINIMUM_LIBC_VERSION = "2.29"
197+
MINIMUM_LIBC_VERSION = GLIBC_VERSION
198198
GLIBC_CUSTOM = str(GLIBC_LIBDIR / "libc.so.6")
199199

200200
REQUIRED_LIBC_LIBS = [
@@ -518,7 +518,7 @@ def install_qnn_sdk() -> bool:
518518
"""
519519
logger.info("[QNN] Starting SDK installation")
520520

521-
_ensure_glibc_minimum("2.29")
521+
_ensure_glibc_minimum(GLIBC_VERSION)
522522

523523
if not _check_tmp_glibc():
524524
logger.error("[glibc] Pre-installed glibc check failed. Exiting early.")

0 commit comments

Comments
 (0)