docker/ubuntu-full/Dockerfile: re-enable QB3 [ci skip]

OSGeo-jp · Apr 25, 2024 · d9c291b · d9c291b
1 parent 5cd7def
commit d9c291b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/docker/ubuntu-full/Dockerfile b/docker/ubuntu-full/Dockerfile
@@ -188,19 +188,18 @@ RUN . /buildscripts/bh-set-envvars.sh \
   && rm -rf FileGDB_API-RHEL7-64gcc83.tar.gz \
   ) ; fi
 
-# DISABLED: cf https://github.com/lucianpls/QB3/issues/16
 # Build libqb3
-#RUN . /buildscripts/bh-set-envvars.sh \
-#    && git clone https://github.com/lucianpls/QB3.git \
-#    && cd QB3/QB3lib \
-#    && mkdir build \
-#    && cd build \
-#    && cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. \
-#    && make -j$(nproc) \
-#    && make -j$(nproc) install \
-#    && make install DESTDIR="/build_thirdparty" \
-#    && cd ../../.. \
-#    && rm -rf QB3
+RUN . /buildscripts/bh-set-envvars.sh \
+    && git clone https://github.com/lucianpls/QB3.git \
+    && cd QB3/QB3lib \
+    && mkdir build \
+    && cd build \
+    && cmake .. ${CMAKE_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release \
+    && make -j$(nproc) \
+    && make -j$(nproc) install \
+    && make install DESTDIR="/build_thirdparty" \
+    && cd ../../.. \
+    && rm -rf QB3
 
 ARG WITH_PDFIUM=yes
 RUN if echo "$WITH_PDFIUM" | grep -Eiq "^(y(es)?|1|true)$"  ; then ( \

diff --git a/docker/ubuntu-full/bh-set-envvars.sh b/docker/ubuntu-full/bh-set-envvars.sh
@@ -12,9 +12,11 @@ if test "${TARGET_ARCH:-}" != ""; then
   export CC=${GCC_ARCH}-linux-gnu-gcc-13
   export CXX=${GCC_ARCH}-linux-gnu-g++-13
   export WITH_HOST="--host=${GCC_ARCH}-linux-gnu"
+  export CMAKE_EXTRA_ARGS=" -DCMAKE_SYSTEM_PROCESSOR=${TARGET_ARCH} "
 else
   export APT_ARCH_SUFFIX=""
   export WITH_HOST=""
   GCC_ARCH="$(uname -m)"
   export GCC_ARCH
+  export CMAKE_EXTRA_ARGS=""
 fi