From 4b10aa9fb9dd9bbd08f1a7b7a48be9afbd60ee8b Mon Sep 17 00:00:00 2001 From: xiaolinjunhao <981755938@qq.com> Date: Thu, 20 Mar 2025 09:00:42 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=94=E7=94=A8qgis3.3?= =?UTF-8?q?4.7=E5=8F=8A=E5=85=B6=E4=BE=9D=E8=B5=96draco1.5.2\gdal3.4.1\pda?= =?UTF-8?q?l2.3.0\qtkeychain0.13.2\spatialindex1.9.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package/draco/1.5.2/install.sh | 13 +++ package/gdal/3.4.1/install.sh | 21 +++++ package/pdal/2.3.0/install.sh | 17 ++++ package/qtkeychain/0.13.2/install.sh | 13 +++ package/qwt/6.1.5/install.sh | 13 +++ package/spatialindex/1.9.3/install.sh | 12 +++ .../qgis/3.34.7/data.qgis.arm.cpu.config | 89 +++++++++++++++++++ 7 files changed, 178 insertions(+) create mode 100755 package/draco/1.5.2/install.sh create mode 100755 package/gdal/3.4.1/install.sh create mode 100755 package/pdal/2.3.0/install.sh create mode 100755 package/qtkeychain/0.13.2/install.sh create mode 100755 package/qwt/6.1.5/install.sh create mode 100755 package/spatialindex/1.9.3/install.sh create mode 100644 templates/qgis/3.34.7/data.qgis.arm.cpu.config diff --git a/package/draco/1.5.2/install.sh b/package/draco/1.5.2/install.sh new file mode 100755 index 0000000..411b9f2 --- /dev/null +++ b/package/draco/1.5.2/install.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -x +set -e +. ${DOWNLOAD_TOOL} -u https://github.com/google/draco/archive/refs/tags/1.5.2.tar.gz +cd ${JARVIS_TMP} +rm -rf draco-1.5.2 +tar -xvf ${JARVIS_DOWNLOAD}/1.5.2.tar.gz +cd draco-1.5.2 + +mkdir build && cd build +cmake -DCMAKE_INSTALL_PREFIX=$1 -DBUILD_SHARED_LIBS=ON .. +make -j4 +make install diff --git a/package/gdal/3.4.1/install.sh b/package/gdal/3.4.1/install.sh new file mode 100755 index 0000000..e78048e --- /dev/null +++ b/package/gdal/3.4.1/install.sh @@ -0,0 +1,21 @@ +#!/bin/bash +set -x +set -e + +yum install -y proj-devel +. ${DOWNLOAD_TOOL} -u https://download.osgeo.org/gdal/3.4.1/gdal-3.4.1.tar.gz +cd ${JARVIS_TMP} +rm -rf gdal-3.4.1 +tar -zxf ${JARVIS_DOWNLOAD}/gdal-3.4.1.tar.gz +cd gdal-3.4.1 + +if [ -z "$HDF5_CLANG_PATH" ]; then + ./configure --prefix=$1 --with-hdf5=no +else + # HDF5版本不可超过1.13.x, 高版本H5FD_class_t结构体发生变化,gdal3.4.1中定义的变量无法匹配 + ./configure --prefix=$1 --with-hdf5=${HDF5_CLANG_PATH} +fi + +make -j4 +make install + diff --git a/package/pdal/2.3.0/install.sh b/package/pdal/2.3.0/install.sh new file mode 100755 index 0000000..c490a42 --- /dev/null +++ b/package/pdal/2.3.0/install.sh @@ -0,0 +1,17 @@ +#!/bin/bash +set -x +set -e +yum install -y libgeotiff-devel +. ${DOWNLOAD_TOOL} -u https://github.com/PDAL/PDAL/archive/refs/tags/2.3.0.tar.gz +cd ${JARVIS_TMP} +rm -rf PDAL-2.3.0 +tar -xvf ${JARVIS_DOWNLOAD}/2.3.0.tar.gz +cd PDAL-2.3.0 + +# pdal依赖gdal,config文件中可通过module load gdal,直接在命令行安装pdal则需要执行导入: +# export GDAL_DIR=${JARVIS_LIBS}/bisheng4.1.0/gdal/3.4.1 + +mkdir build && cd build +cmake -DCMAKE_INSTALL_PREFIX=$1 .. +make -j4 +make install diff --git a/package/qtkeychain/0.13.2/install.sh b/package/qtkeychain/0.13.2/install.sh new file mode 100755 index 0000000..b842a44 --- /dev/null +++ b/package/qtkeychain/0.13.2/install.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -x +set -e +yum install -y libsecret-devel +. ${DOWNLOAD_TOOL} -u https://github.com/frankosterfeld/qtkeychain/archive/refs/tags/v0.13.2.tar.gz +cd ${JARVIS_TMP} +rm -rf qtkeychain-0.13.2 +tar -zxf ${JARVIS_DOWNLOAD}/v0.13.2.tar.gz +cd qtkeychain-0.13.2 +mkdir build && cd build +cmake -DCMAKE_INSTALL_PREFIX=$1 .. +make -j4 +make install diff --git a/package/qwt/6.1.5/install.sh b/package/qwt/6.1.5/install.sh new file mode 100755 index 0000000..29c02a6 --- /dev/null +++ b/package/qwt/6.1.5/install.sh @@ -0,0 +1,13 @@ +#!/bin/bash +set -x +set -e +yum install -y qt5-devel qt5-qtbase-private-devel qt5-qttools-static qt5-qtsvg-devel +. ${DOWNLOAD_TOOL} -u https://downloads.sourceforge.net/qwt/qwt-6.1.5.tar.bz2 +cd ${JARVIS_TMP} +rm -rf qwt-6.1.5 +tar -xjf ${JARVIS_DOWNLOAD}/qwt-6.1.5.tar.bz2 +cd qwt-6.1.5 +sed -i "22c \ QWT_INSTALL_PREFIX = $1" qwtconfig.pri +qmake-qt5 qwt.pro +make -j4 +make install diff --git a/package/spatialindex/1.9.3/install.sh b/package/spatialindex/1.9.3/install.sh new file mode 100755 index 0000000..8300bba --- /dev/null +++ b/package/spatialindex/1.9.3/install.sh @@ -0,0 +1,12 @@ +#!/bin/bash +set -x +set -e +. ${DOWNLOAD_TOOL} -u https://github.com/libspatialindex/libspatialindex/archive/refs/tags/1.9.3.tar.gz +cd ${JARVIS_TMP} +rm -rf libspatialindex-1.9.3 +tar -zxf ${JARVIS_DOWNLOAD}/1.9.3.tar.gz +cd libspatialindex-1.9.3 +mkdir build && cd build +cmake -DCMAKE_INSTALL_PREFIX=$1 .. +make -j4 +make install diff --git a/templates/qgis/3.34.7/data.qgis.arm.cpu.config b/templates/qgis/3.34.7/data.qgis.arm.cpu.config new file mode 100644 index 0000000..e8d4278 --- /dev/null +++ b/templates/qgis/3.34.7/data.qgis.arm.cpu.config @@ -0,0 +1,89 @@ +[SERVER] +11.11.11.11 + +[DOWNLOAD] +qgis/3.34.7 https://github.com/qgis/QGIS/archive/refs/tags/final-3_34_7.zip QGIS-final-3_34_7.zip + +[DEPENDENCY] +set -e +set -x + +dnf install -y python3 python3-devel cmake + +./jarvis -install bisheng/4.1.0 com +module purge +module use ./software/modulefiles +module load bisheng/4.1.0 +export CC=`which clang` +export CXX=`which clang++` +export FC=`which flang` + +./jarvis -install hmpi/2.4.2 bisheng +module load hmpi/2.4.2 + +./jarvis -install hdf5/1.12.0/clang bisheng+mpi +module load hdf5-clang/1.12.0 + +./jarvis -install gdal/3.4.1 bisheng+mpi +module load gdal/3.4.1 +pip3 install GDAL==3.4.1 + +./jarvis -install pdal/2.3.0 bisheng +module load pdal/2.3.0 + +./jarvis -install draco/1.5.2 bisheng +module load draco/1.5.2 + +./jarvis -install qwt/6.1.5 bisheng +module load qwt/6.1.5 + +./jarvis -install qtkeychain/0.13.2 bisheng +module load qtkeychain/0.13.2 + +./jarvis -install spatialindex/1.9.3 bisheng +module load spatialindex/1.9.3 + +pip3 install OWSLib==0.25.0 + +dnf install -y qt5-qtbase-private-devel qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qtmultimedia-devel qt5-qttools-static qca-qt5-devel qca-qt5-ossl qt5-qt3d-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-qt5 clang flex bison geos-devel hdf5-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel qt5-qtbase-odbc expat-devel proj-devel gsl-devel postgresql-devel python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 qca-qt5-ossl libzip-devel exiv2-devel python3-sip-devel protobuf-lite protobuf-lite-devel libzstd-devel qt5-qtserialport-devel + +rm -rf QGIS-final-3_34_7 +unzip ${JARVIS_DOWNLOAD}/QGIS-final-3_34_7.zip + +[ENV] +module purge +module use ./software/modulefiles +module load bisheng/4.1.0 +module load gdal/3.4.1 +module load pdal/2.3.0 +module load draco/1.5.2 +export CPATH=${DRACO_PATH}/include:$CPATH +module load qwt/6.1.5 +module load qtkeychain/0.13.2 +module load spatialindex/1.9.3 + +[APP] +app_name = qgis +build_dir = ${JARVIS_ROOT}/QGIS-final-3_34_7 +binary_dir = +case_dir = ${JARVIS_ROOT}/QGIS-final-3_34_7/build + +[BUILD] +mkdir -p build +cd build +cmake -DENABLE_TESTS=TRUE -DDRACO_INCLUDE_DIR=${DRACO_PATH}/include -DDRACO_LIBRARY=${DRACO_PATH}/lib64/libdraco.so -DQWT_INCLUDE_DIR=${QWT_PATH}/include -DQWT_LIBRARY=${QWT_PATH}/lib/libqwt.so -DSPATIALINDEX_INCLUDE_PATH=${SPATIALINDEX_PATH}/include -DSPATIALINDEX_LIBRARY=${SPATIALINDEX_PATH}/lib/libspatialindex.so -DQTKEYCHAIN_INCLUDE_PATH=${QTKEYCHAIN_PATH}/include/qt5keychain -DQTKEYCHAIN_LIBRARY=${QTKEYCHAIN_PATH}/lib64/libqt5keychain.so .. +make -j4 +make install + +[CLEAN] +make clean + +[RUN] +run = make test +binary = +nodes = 1 + +[PERF] +perf= +nsys= +ncu=--target-processes all -- Gitee From 416aab67ddef5a1cf13bda3027987f7488826794 Mon Sep 17 00:00:00 2001 From: xiaolinjunhao <981755938@qq.com> Date: Wed, 26 Mar 2025 05:16:52 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=94=AF=E6=8C=81hpckit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3.34.7/data.qgis.arm.cpu.hpckit.config | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config diff --git a/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config b/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config new file mode 100644 index 0000000..4423243 --- /dev/null +++ b/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config @@ -0,0 +1,89 @@ +[SERVER] +11.11.11.11 + +[DOWNLOAD] +qgis/3.34.7 https://github.com/qgis/QGIS/archive/refs/tags/final-3_34_7.zip QGIS-final-3_34_7.zip + +[DEPENDENCY] +set -e +set -x + +dnf install -y python3 python3-devel cmake + +module purge +./jarvis -install hpckit/2024.12.30 com +module use ./software/compiler/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module load bisheng/compiler4.1.0/bishengmodule +module load bisheng/hmpi2.4.3/hmpi +export CC=mpicc CXX=mpicxx FC=mpifort +module use ./software/moduledeps/bisheng4.1.0-hmpi2.4.3 + +./jarvis -install hdf5/1.12.0/clang bisheng+mpi +module load hdf5-clang/1.12.0 + +./jarvis -install gdal/3.4.1 bisheng+mpi +module load gdal/3.4.1 +pip3 install GDAL==3.4.1 + +export CC=clang CXX=clang++ FC=flang +module use ./software/moduledeps/bisheng4.1.0 + +./jarvis -install pdal/2.3.0 bisheng +module load pdal/2.3.0 + +./jarvis -install draco/1.5.2 bisheng +module load draco/1.5.2 + +./jarvis -install qwt/6.1.5 bisheng +module load qwt/6.1.5 + +./jarvis -install qtkeychain/0.13.2 bisheng +module load qtkeychain/0.13.2 + +./jarvis -install spatialindex/1.9.3 bisheng +module load spatialindex/1.9.3 + +pip3 install OWSLib==0.25.0 + +dnf install -y qt5-qtbase-private-devel qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qtmultimedia-devel qt5-qttools-static qca-qt5-devel qca-qt5-ossl qt5-qt3d-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-qt5 clang flex bison geos-devel hdf5-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel qt5-qtbase-odbc expat-devel proj-devel gsl-devel postgresql-devel python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 qca-qt5-ossl libzip-devel exiv2-devel python3-sip-devel protobuf-lite protobuf-lite-devel libzstd-devel qt5-qtserialport-devel + +rm -rf QGIS-final-3_34_7 +unzip ${JARVIS_DOWNLOAD}/QGIS-final-3_34_7.zip + +[ENV] +module purge +module use ./software/modulefiles +module load bisheng/4.1.0 +module load gdal/3.4.1 +module load pdal/2.3.0 +module load draco/1.5.2 +export CPATH=${DRACO_PATH}/include:$CPATH +module load qwt/6.1.5 +module load qtkeychain/0.13.2 +module load spatialindex/1.9.3 + +[APP] +app_name = qgis +build_dir = ${JARVIS_ROOT}/QGIS-final-3_34_7 +binary_dir = +case_dir = ${JARVIS_ROOT}/QGIS-final-3_34_7/build + +[BUILD] +mkdir -p build +cd build +cmake -DENABLE_TESTS=TRUE -DDRACO_INCLUDE_DIR=${DRACO_PATH}/include -DDRACO_LIBRARY=${DRACO_PATH}/lib64/libdraco.so -DQWT_INCLUDE_DIR=${QWT_PATH}/include -DQWT_LIBRARY=${QWT_PATH}/lib/libqwt.so -DSPATIALINDEX_INCLUDE_PATH=${SPATIALINDEX_PATH}/include -DSPATIALINDEX_LIBRARY=${SPATIALINDEX_PATH}/lib/libspatialindex.so -DQTKEYCHAIN_INCLUDE_PATH=${QTKEYCHAIN_PATH}/include/qt5keychain -DQTKEYCHAIN_LIBRARY=${QTKEYCHAIN_PATH}/lib64/libqt5keychain.so .. +make -j4 +make install + +[CLEAN] +make clean + +[RUN] +run = make test +binary = +nodes = 1 + +[PERF] +perf= +nsys= +ncu=--target-processes all -- Gitee From 0edfe8a422bde18622f5575b531016863c7dd849 Mon Sep 17 00:00:00 2001 From: xiaolinjunhao <981755938@qq.com> Date: Wed, 26 Mar 2025 22:57:11 +0800 Subject: [PATCH 3/5] update dbf to yum --- templates/qgis/3.34.7/data.qgis.arm.cpu.config | 10 +++++++++- .../qgis/3.34.7/data.qgis.arm.cpu.hpckit.config | 13 ++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/templates/qgis/3.34.7/data.qgis.arm.cpu.config b/templates/qgis/3.34.7/data.qgis.arm.cpu.config index e8d4278..80af9a6 100644 --- a/templates/qgis/3.34.7/data.qgis.arm.cpu.config +++ b/templates/qgis/3.34.7/data.qgis.arm.cpu.config @@ -28,6 +28,8 @@ module load hdf5-clang/1.12.0 module load gdal/3.4.1 pip3 install GDAL==3.4.1 +module load bisheng/4.1.0 + ./jarvis -install pdal/2.3.0 bisheng module load pdal/2.3.0 @@ -45,7 +47,7 @@ module load spatialindex/1.9.3 pip3 install OWSLib==0.25.0 -dnf install -y qt5-qtbase-private-devel qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qtmultimedia-devel qt5-qttools-static qca-qt5-devel qca-qt5-ossl qt5-qt3d-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-qt5 clang flex bison geos-devel hdf5-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel qt5-qtbase-odbc expat-devel proj-devel gsl-devel postgresql-devel python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 qca-qt5-ossl libzip-devel exiv2-devel python3-sip-devel protobuf-lite protobuf-lite-devel libzstd-devel qt5-qtserialport-devel +yum install -y qt5-qtbase-private-devel qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qtmultimedia-devel qt5-qttools-static qca-qt5-devel qca-qt5-ossl qt5-qt3d-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-qt5 clang flex bison geos-devel hdf5-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel qt5-qtbase-odbc expat-devel proj-devel gsl-devel postgresql-devel python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 qca-qt5-ossl libzip-devel exiv2-devel python3-sip-devel protobuf-lite protobuf-lite-devel libzstd-devel qt5-qtserialport-devel rm -rf QGIS-final-3_34_7 unzip ${JARVIS_DOWNLOAD}/QGIS-final-3_34_7.zip @@ -54,7 +56,13 @@ unzip ${JARVIS_DOWNLOAD}/QGIS-final-3_34_7.zip module purge module use ./software/modulefiles module load bisheng/4.1.0 +module load hmpi/2.4.2 +export CPATH=${HMPI_PATH}/include:$CPATH + +module use ./software/moduledeps/bisheng4.1.0-hmpi2.4.2 +module load hdf5-clang/1.12.0 module load gdal/3.4.1 + module load pdal/2.3.0 module load draco/1.5.2 export CPATH=${DRACO_PATH}/include:$CPATH diff --git a/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config b/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config index 4423243..2efc4ea 100644 --- a/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config +++ b/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config @@ -45,16 +45,23 @@ module load spatialindex/1.9.3 pip3 install OWSLib==0.25.0 -dnf install -y qt5-qtbase-private-devel qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qtmultimedia-devel qt5-qttools-static qca-qt5-devel qca-qt5-ossl qt5-qt3d-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-qt5 clang flex bison geos-devel hdf5-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel qt5-qtbase-odbc expat-devel proj-devel gsl-devel postgresql-devel python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 qca-qt5-ossl libzip-devel exiv2-devel python3-sip-devel protobuf-lite protobuf-lite-devel libzstd-devel qt5-qtserialport-devel +yum install -y qt5-qtbase-private-devel qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qtmultimedia-devel qt5-qttools-static qca-qt5-devel qca-qt5-ossl qt5-qt3d-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-qt5 clang flex bison geos-devel hdf5-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel qt5-qtbase-odbc expat-devel proj-devel gsl-devel postgresql-devel python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 qca-qt5-ossl libzip-devel exiv2-devel python3-sip-devel protobuf-lite protobuf-lite-devel libzstd-devel qt5-qtserialport-devel rm -rf QGIS-final-3_34_7 unzip ${JARVIS_DOWNLOAD}/QGIS-final-3_34_7.zip [ENV] module purge -module use ./software/modulefiles -module load bisheng/4.1.0 +module use ./software/compiler/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles +module load bisheng/compiler4.1.0/bishengmodule +module load bisheng/hmpi2.4.3/hmpi +export CPATH=${hmpi_path}/include:$CPATH + +module use ./software/moduledeps/bisheng4.1.0-hmpi2.4.3 +module load hdf5-clang/1.12.0 module load gdal/3.4.1 + +module use ./software/moduledeps/bisheng4.1.0 module load pdal/2.3.0 module load draco/1.5.2 export CPATH=${DRACO_PATH}/include:$CPATH -- Gitee From c9151bf58bc01393bfce91a7d27923d67ac05d68 Mon Sep 17 00:00:00 2001 From: xiaolinjunhao <981755938@qq.com> Date: Fri, 28 Mar 2025 04:05:48 +0800 Subject: [PATCH 4/5] update to make -j --- package/draco/1.5.2/install.sh | 2 +- package/gdal/3.4.1/install.sh | 2 +- package/pdal/2.3.0/install.sh | 2 +- package/qtkeychain/0.13.2/install.sh | 2 +- package/qwt/6.1.5/install.sh | 2 +- package/spatialindex/1.9.3/install.sh | 2 +- templates/qgis/3.34.7/data.qgis.arm.cpu.config | 2 +- templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package/draco/1.5.2/install.sh b/package/draco/1.5.2/install.sh index 411b9f2..94f4d50 100755 --- a/package/draco/1.5.2/install.sh +++ b/package/draco/1.5.2/install.sh @@ -9,5 +9,5 @@ cd draco-1.5.2 mkdir build && cd build cmake -DCMAKE_INSTALL_PREFIX=$1 -DBUILD_SHARED_LIBS=ON .. -make -j4 +make -j make install diff --git a/package/gdal/3.4.1/install.sh b/package/gdal/3.4.1/install.sh index e78048e..1d14bcd 100755 --- a/package/gdal/3.4.1/install.sh +++ b/package/gdal/3.4.1/install.sh @@ -16,6 +16,6 @@ else ./configure --prefix=$1 --with-hdf5=${HDF5_CLANG_PATH} fi -make -j4 +make -j make install diff --git a/package/pdal/2.3.0/install.sh b/package/pdal/2.3.0/install.sh index c490a42..fd2f977 100755 --- a/package/pdal/2.3.0/install.sh +++ b/package/pdal/2.3.0/install.sh @@ -13,5 +13,5 @@ cd PDAL-2.3.0 mkdir build && cd build cmake -DCMAKE_INSTALL_PREFIX=$1 .. -make -j4 +make -j make install diff --git a/package/qtkeychain/0.13.2/install.sh b/package/qtkeychain/0.13.2/install.sh index b842a44..76304cc 100755 --- a/package/qtkeychain/0.13.2/install.sh +++ b/package/qtkeychain/0.13.2/install.sh @@ -9,5 +9,5 @@ tar -zxf ${JARVIS_DOWNLOAD}/v0.13.2.tar.gz cd qtkeychain-0.13.2 mkdir build && cd build cmake -DCMAKE_INSTALL_PREFIX=$1 .. -make -j4 +make -j make install diff --git a/package/qwt/6.1.5/install.sh b/package/qwt/6.1.5/install.sh index 29c02a6..4fd0e77 100755 --- a/package/qwt/6.1.5/install.sh +++ b/package/qwt/6.1.5/install.sh @@ -9,5 +9,5 @@ tar -xjf ${JARVIS_DOWNLOAD}/qwt-6.1.5.tar.bz2 cd qwt-6.1.5 sed -i "22c \ QWT_INSTALL_PREFIX = $1" qwtconfig.pri qmake-qt5 qwt.pro -make -j4 +make -j make install diff --git a/package/spatialindex/1.9.3/install.sh b/package/spatialindex/1.9.3/install.sh index 8300bba..9a01742 100755 --- a/package/spatialindex/1.9.3/install.sh +++ b/package/spatialindex/1.9.3/install.sh @@ -8,5 +8,5 @@ tar -zxf ${JARVIS_DOWNLOAD}/1.9.3.tar.gz cd libspatialindex-1.9.3 mkdir build && cd build cmake -DCMAKE_INSTALL_PREFIX=$1 .. -make -j4 +make -j make install diff --git a/templates/qgis/3.34.7/data.qgis.arm.cpu.config b/templates/qgis/3.34.7/data.qgis.arm.cpu.config index 80af9a6..0f8df63 100644 --- a/templates/qgis/3.34.7/data.qgis.arm.cpu.config +++ b/templates/qgis/3.34.7/data.qgis.arm.cpu.config @@ -80,7 +80,7 @@ case_dir = ${JARVIS_ROOT}/QGIS-final-3_34_7/build mkdir -p build cd build cmake -DENABLE_TESTS=TRUE -DDRACO_INCLUDE_DIR=${DRACO_PATH}/include -DDRACO_LIBRARY=${DRACO_PATH}/lib64/libdraco.so -DQWT_INCLUDE_DIR=${QWT_PATH}/include -DQWT_LIBRARY=${QWT_PATH}/lib/libqwt.so -DSPATIALINDEX_INCLUDE_PATH=${SPATIALINDEX_PATH}/include -DSPATIALINDEX_LIBRARY=${SPATIALINDEX_PATH}/lib/libspatialindex.so -DQTKEYCHAIN_INCLUDE_PATH=${QTKEYCHAIN_PATH}/include/qt5keychain -DQTKEYCHAIN_LIBRARY=${QTKEYCHAIN_PATH}/lib64/libqt5keychain.so .. -make -j4 +make -j make install [CLEAN] diff --git a/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config b/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config index 2efc4ea..b83117c 100644 --- a/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config +++ b/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config @@ -55,7 +55,7 @@ module purge module use ./software/compiler/hpckit/2024.12.30/HPCKit/24.12.30/modulefiles module load bisheng/compiler4.1.0/bishengmodule module load bisheng/hmpi2.4.3/hmpi -export CPATH=${hmpi_path}/include:$CPATH +export CPATH=${OPAL_PREFIX}/include:$CPATH module use ./software/moduledeps/bisheng4.1.0-hmpi2.4.3 module load hdf5-clang/1.12.0 @@ -79,7 +79,7 @@ case_dir = ${JARVIS_ROOT}/QGIS-final-3_34_7/build mkdir -p build cd build cmake -DENABLE_TESTS=TRUE -DDRACO_INCLUDE_DIR=${DRACO_PATH}/include -DDRACO_LIBRARY=${DRACO_PATH}/lib64/libdraco.so -DQWT_INCLUDE_DIR=${QWT_PATH}/include -DQWT_LIBRARY=${QWT_PATH}/lib/libqwt.so -DSPATIALINDEX_INCLUDE_PATH=${SPATIALINDEX_PATH}/include -DSPATIALINDEX_LIBRARY=${SPATIALINDEX_PATH}/lib/libspatialindex.so -DQTKEYCHAIN_INCLUDE_PATH=${QTKEYCHAIN_PATH}/include/qt5keychain -DQTKEYCHAIN_LIBRARY=${QTKEYCHAIN_PATH}/lib64/libqt5keychain.so .. -make -j4 +make -j make install [CLEAN] -- Gitee From a6fff368dee948a2fbef398b03e4e8e94cadef91 Mon Sep 17 00:00:00 2001 From: xiaolinjunhao <981755938@qq.com> Date: Tue, 1 Apr 2025 00:11:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=81=97=E6=BC=8F=E4=BA=86=E9=83=A8?= =?UTF-8?q?=E5=88=86dnf->yum=EF=BC=8C=E4=BB=94=E7=BB=86=EF=BC=81=EF=BC=81?= =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/qgis/3.34.7/data.qgis.arm.cpu.config | 2 +- templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/qgis/3.34.7/data.qgis.arm.cpu.config b/templates/qgis/3.34.7/data.qgis.arm.cpu.config index 0f8df63..2e1f7b3 100644 --- a/templates/qgis/3.34.7/data.qgis.arm.cpu.config +++ b/templates/qgis/3.34.7/data.qgis.arm.cpu.config @@ -8,7 +8,7 @@ qgis/3.34.7 https://github.com/qgis/QGIS/archive/refs/tags/final-3_34_7.zip QGIS set -e set -x -dnf install -y python3 python3-devel cmake +yum install -y python3 python3-devel cmake ./jarvis -install bisheng/4.1.0 com module purge diff --git a/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config b/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config index b83117c..8643ebb 100644 --- a/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config +++ b/templates/qgis/3.34.7/data.qgis.arm.cpu.hpckit.config @@ -8,7 +8,7 @@ qgis/3.34.7 https://github.com/qgis/QGIS/archive/refs/tags/final-3_34_7.zip QGIS set -e set -x -dnf install -y python3 python3-devel cmake +yum install -y python3 python3-devel cmake module purge ./jarvis -install hpckit/2024.12.30 com -- Gitee