From a13b9154e9f8643f4614372a8ed922ee8b0d7e1a Mon Sep 17 00:00:00 2001
From: "aleksandr.vodianov@demlabs.net" <aleksandr.vodianov@demlabs.net>
Date: Mon, 10 Jan 2022 12:16:10 +0300
Subject: [PATCH] upd compile for arm && amd
---
linux/debian/scripts/compile_and_pack.sh | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/linux/debian/scripts/compile_and_pack.sh b/linux/debian/scripts/compile_and_pack.sh
index 7652ea6..951e91f 100755
--- a/linux/debian/scripts/compile_and_pack.sh
+++ b/linux/debian/scripts/compile_and_pack.sh
@@ -43,12 +43,11 @@ pwd
error=0
mkdir -p packages
-echo "Build for $ARCH_VERSIONS architectures"
-substitute_pkgname_postfix && mkdir -p build && cd build && ${CMAKE_PATH}cmake ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * \
-&& ${CMAKE_PATH}cmake -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$?
+echo "Build for $ARCH_VERSION architectures"
+substitute_pkgname_postfix && mkdir -p build && cd build
echo $error
-if [[ $(echo $DISTR_CODENAME | bullseye ) != "" && $error == 0 ]]; then
+if [[ $ARCH_VERSION == "arm" ]]; then
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH_ARM64
${CMAKE_PATH}cmake -DCMAKE_C_COMPILER=$ARM64_C_COMPILER -DCMAKE_CXX_COMPLIER=$ARM64_CXX_COMPILER -DCMAKE_TARGET_ARCH="arm64" .. && make -j$(nproc) && \
${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * && \
@@ -62,7 +61,11 @@ if [[ $(echo $DISTR_CODENAME | bullseye ) != "" && $error == 0 ]]; then
unset LD_LIBRARY_PATH
fi
-if [[ $(echo $BUILD_TYPE | grep PGSQL) != "" && $error == 0 ]]; then
+if
+if [[ $ARCH_VERSION == "amd64" ]]; then
+ ${CMAKE_PATH}cmake ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * \
+ && ${CMAKE_PATH}cmake -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$?
+
sed -ibak 's/#set(BUILD_WITH_GDB_DRIVER_PGSQL ON)/set(BUILD_WITH_GDB_DRIVER_PGSQL ON)/' ../CMakeLists.txt || error=$?
${CMAKE_PATH}cmake ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * \
&& ${CMAKE_PATH}cmake -DCMAKE_BUILD_TYPE=Debug ../ && make -j$(nproc) && ${CMAKE_PATH}cpack && repack *.deb && mv -v *.deb ../packages/ && rm -r * || error=$?
--
GitLab