Mount-independent GeographicLib rpath and DEB production fixes
- CMakeLists.txt: add a $ORIGIN-based CMAKE_BUILD_RPATH entry for the bundled GeographicLib (include/GeographicLib/lib), like the existing RTI entry. The imported GeographicLib target only contributed the absolute container mount path to the build RUNPATH, so binaries could not resolve libGeographicLib.so.26 outside the /repo mount. Verified: ddsview built and run in a container with a different mount prefix resolves it via $ORIGIN and starts (rc=0). - new_docker_build.sh: seed the DEB cmake with ARCGIS_INCLUDE_DIR / ARCGIS_LIBRARY (the staged source copy cannot resolve the ArcGIS SDK, which is a relative symlink to the pipeline root dangling after staging); retry the build-tree removal with a clear error when a concurrent build/IDE keeps the directory busy. - Dockerfile: add a late apt layer with devscripts + debhelper (debuild, dh) for the DEB flow; cached Qt/KDReports layers are preserved. - README.md: document that --run-coverage and --run-jenkins-builder are combinable (DEB step runs after the coverage collection).
This commit is contained in:
1 parent
f1f2c5eec8
commit
113d4ab5ed
4 files changed
+47
-11
No files matched your search
@@ -65,6 +65,12 @@ RUN git clone --depth 1 https://github.com/KDAB/KDReports.git /tmp/KDReports &&
|
||||
# Legacy sources include <KDReports/...>
|
||||
RUN ln -sfn KDReports-qt6 /usr/local/include/KDReports
|
||||
|
||||
# Debian packaging tools for the DEB flow (debuild, dh). Separate late layer
|
||||
# so the Qt/KDReports layers above stay cached when this list changes.
|
||||
RUN apt-get update -qq && \
|
||||
apt-get install -y -qq --no-install-recommends devscripts debhelper && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
ENV PATH="${QT_BASE_DIR}/${QT_VERSION}/gcc_64/bin:${PATH}"
|
||||
ENV CMAKE_PREFIX_PATH="${QT_BASE_DIR}/${QT_VERSION}/gcc_64"
|
||||
|
||||
|
||||
Reference in new issue
Block a user