Skip to content

Commit 9036801

Browse files
committed
fix: fix LC_RPATH in _chdb.abi3.so
1 parent 6d4f4ce commit 9036801

File tree

6 files changed

+22
-6
lines changed

6 files changed

+22
-6
lines changed

.github/workflows/build_linux_arm64_wheels-gh.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ on:
2323

2424
jobs:
2525
build_universal_wheel:
26-
name: Build Universal Wheel (Linux ARM64)
26+
name: Build Universal Wheel (Linux arm64)
2727
runs-on: GH-Linux-ARM64
2828
if: ${{ !github.event.pull_request.draft }}
2929
steps:

.github/workflows/build_linux_x86_wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build Linux X86
1+
name: Build Linux x86_64
22

33
on:
44
workflow_dispatch:

.github/workflows/build_macos_x86_wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build macOS X86
1+
name: Build macOS x86_64
22

33
on:
44
workflow_dispatch:

.github/workflows/build_musllinux_arm64_wheels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build Linux(musllinux) ARM64
1+
name: Build Linux(musllinux) arm64
22

33
on:
44
workflow_dispatch:
@@ -22,7 +22,7 @@ on:
2222

2323
jobs:
2424
build_musllinux_wheels:
25-
name: Build musllinux wheels (Alpine Linux aarch64)
25+
name: Build musllinux wheels (Alpine Linux arm64)
2626
runs-on: GH-Linux-ARM64
2727
if: ${{ !github.event.pull_request.draft }}
2828
steps:

.github/workflows/build_musllinux_x86_wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build Linux(musllinux) x86
1+
name: Build Linux(musllinux) x86_64
22

33
on:
44
workflow_dispatch:

chdb/build_mac_on_linux.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,22 @@ if ! CMAKE_ARGS="${CMAKE_ARGS}" CHDB_PYTHON_INCLUDE_DIR_PREFIX="${HOME}/python_i
285285
exit 1
286286
fi
287287

288+
# Fix LC_RPATH in _chdb.abi3.so for cross-compiled builds
289+
echo -e "\nFixing LC_RPATH in ${CHDB_PY_MODULE}..."
290+
INSTALL_NAME_TOOL="${CCTOOLS_BIN}/${DARWIN_TRIPLE}-install_name_tool"
291+
OTOOL="${CCTOOLS_BIN}/${DARWIN_TRIPLE}-otool"
292+
OLD_RPATH=$(${OTOOL} -l ${CHDB_DIR}/${CHDB_PY_MODULE} | grep -A2 LC_RPATH | grep path | awk '{print $2}' | head -1)
293+
if [ -n "${OLD_RPATH}" ]; then
294+
echo " Current RPATH: ${OLD_RPATH}"
295+
${INSTALL_NAME_TOOL} -rpath "${OLD_RPATH}" "@loader_path" ${CHDB_DIR}/${CHDB_PY_MODULE}
296+
echo " Changed RPATH to: @loader_path"
297+
else
298+
echo " No LC_RPATH found, adding @loader_path"
299+
${INSTALL_NAME_TOOL} -add_rpath "@loader_path" ${CHDB_DIR}/${CHDB_PY_MODULE} || true
300+
fi
301+
echo -e "\nVerifying LC_RPATH:"
302+
${OTOOL} -l ${CHDB_DIR}/${CHDB_PY_MODULE} | grep -A2 LC_RPATH || echo "No LC_RPATH found"
303+
288304
echo -e "\nCross-compilation for macOS ${TARGET_ARCH} completed successfully!"
289305
echo -e "Generated files:"
290306
echo -e " - ${PROJ_DIR}/${LIBCHDB_SO}"

0 commit comments

Comments
 (0)