Skip to content

Commit 1e04091

Browse files
committed
wrong place to put the define, now set it in the package step.
1 parent cafe1ea commit 1e04091

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

.github/workflows/cppcmake.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ jobs:
4545
# ARM Linux builds - cross-compiled with QEMU testing (Jetson, Raspberry Pi compatible)
4646
# SHLIBDEPS must be disabled for cross-compiled packages as the host system
4747
# does not have the target architecture libraries installed
48-
- {name: "ubuntu-22.04-arm64", os: "ubuntu-22.04", arch: "aarch64", cross_compile: true, cmake_extra: "-DLSL_BUNDLED_PUGIXML=ON -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=OFF" }
49-
- {name: "ubuntu-22.04-armhf", os: "ubuntu-22.04", arch: "armv7", cross_compile: true, cmake_extra: "-DLSL_BUNDLED_PUGIXML=ON -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=OFF" }
48+
- {name: "ubuntu-22.04-arm64", os: "ubuntu-22.04", arch: "aarch64", cross_compile: true, cmake_extra: "-DLSL_BUNDLED_PUGIXML=ON" }
49+
- {name: "ubuntu-22.04-armhf", os: "ubuntu-22.04", arch: "armv7", cross_compile: true, cmake_extra: "-DLSL_BUNDLED_PUGIXML=ON" }
5050

5151
# Native ARM build
5252
# - {name: "ubuntu-24.04-arm64-native", os: "ubuntu-24.04-arm", arch: "aarch64", cmake_extra: "-DLSL_BUNDLED_PUGIXML=OFF" }
@@ -177,6 +177,13 @@ jobs:
177177
- name: Package
178178
run: |
179179
echo "Creating package for ${{ matrix.config.arch }}"
180+
181+
# For cross-compiled builds, explicitly disable shlibdeps before packaging
182+
if [[ "${{ matrix.config.cross_compile }}" == "true" ]]; then
183+
# Reconfigure with SHLIBDEPS explicitly OFF for cross-compilation
184+
cmake -DCPACK_DEBIAN_PACKAGE_SHLIBDEPS=OFF build
185+
fi
186+
180187
cmake --build build --target package --config Release -j
181188
182189
# On Debian / Ubuntu the dependencies can only be resolved for

0 commit comments

Comments
 (0)