gcc15 fix

Ramon Nourequested to merge
rnou/deps-gcc15-fix into master

Fix the versions and include DCMAKE_MIN_VERSION... to support last gcc15

Merge request reports

docker/0.9.5/apps/Dockerfile

+1 −1
Changes for docker/0.9.5/apps/Dockerfile: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ COPY --from=builder /usr/local/lib/external /root/wacommplusplus/build/external/ 
WORKDIR /root/wacommplusplus/build/example

RUN mkdir -p input processed output restarts && \

    cd input && \

    wget -q https://api.meteo.uniparthenope.it/files/rms3/d03/history/2025/01/01/rms3_d03_20250101Z0000.nc && \

    wget --no-check-certificate -q https://api.meteo.uniparthenope.it/files/rms3/d03/history/2025/01/01/rms3_d03_20250101Z0000.nc && \

    mv rms3_d03_20250101Z0000.nc input.nc && \

    ncks -7 -L 9 --qnt default=1 --ppc default=1 input.nc rms3_d03_20250101Z0000.nc && \

    tar cvzf rms.tar.gz rms3_d03_20250101Z0000.nc && \

docs/sphinx/users/scripts.rst

+14 −14
Changes for docs/sphinx/users/scripts.rst: 14 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -24,25 +24,25 @@ on the specifics of the particular GekkoFS build, both scripts rely on 
:code:`configuration profiles` which define a set of related software

packages which should be downloaded and installed for a specific GekkoFS

version and/or configuration. To illustrate this, let's take a look at the

contents of the :code:`default` profile for GekkoFS version :code:`0.9.4`:

contents of the :code:`default` profile for GekkoFS version :code:`0.9.5`:



.. code-block:: console



    $ dl_dep.sh -l default:0.9.4

    Configuration profiles for '0.9.4':

    $ dl_dep.sh -l default:0.9.5

    Configuration profiles for '0.9.5':



    * default:0.9.4 (/home/user/gekkofs/source/scripts/profiles/0.9.4/default.specs)

    * default:0.9.5 (/home/user/gekkofs/source/scripts/profiles/0.9.5/default.specs)



      All dependencies



        lz4: 1.9.3

        capstone: 6.0.0-Alpha1

        json-c: 0.15-20200726

        libfabric: HEAD@v1.20.1

        mercury: v2.4.0

        json-c: 0.17-20230812

        libfabric: HEAD@v2.2.0

        mercury: v2.4.1rc1

        argobots: 1.2

        margo: v0.18.3

        rocksdb: 8.10.0

        rocksdb: 10.4.2

        syscall_intercept: d8b2a69961921ed123625c79a609331fc56a8931
@@ -58,10 +58,10 @@ supercomputer) followed by an optional :code:`VERSION_TAG`. 


.. code-block:: console



    $ ./dl_dep.sh -p default:0.9.4 /home/user/gfks/deps

    $ ./dl_dep.sh -p default:0.9.5 /home/user/gfks/deps

    Destination path is set to  "/tmp/foo"

    Profile name: default

    Profile version: 0.9.4

    Profile version: 0.9.5

    ------------------------------------

    Downloaded 'https://github.com/lz4/lz4/archive/v1.9.4.tar.gz' to 'lz4'

    Downloaded 'https://github.com/json-c/json-c/archive/json-c-0.17-20230812.tar.gz' to 'json-c'
@@ -80,10 +80,10 @@ option. In this case, dependency names follow the 


.. code-block:: console



   $ ./dl_dep.sh -d mercury@default:0.9.4 /home/user/gfks/deps

   $ ./dl_dep.sh -d mercury@default:0.9.5 /home/user/gfks/deps

   Destination path is set to  "/tmp/foo"

   Profile name: default

   Profile version: 0.9.3

   Profile version: 0.9.5

   ------------------------------------

   Cloned 'https://github.com/mercury-hpc/mercury' to 'mercury' with commit '[v2.4.0]' and flags '--recurse-submodules'

   Done
@@ -105,12 +105,12 @@ certain directory (e.g. :code:`/home/user/gkfs/deps`), the 


.. code-block:: console



    $ ./compile_dep.sh -p default:0.9.4 /home/user/gkfs/deps /home/user/gkfs/install -j8

    $ ./compile_dep.sh -p default:0.9.5 /home/user/gkfs/deps /home/user/gkfs/install -j8

    CORES = 8 (default)

    Sources download path = /tmp/foo

    Installation path = /tmp/bar

    Profile name: default

    Profile version: 0.9.4

    Profile version: 0.9.5

    ------------------------------------

    ######## Installing:  lz4 ###############################

    ...

scripts/profiles/0.9.5/install/json-c.install

+1 −1
Changes for scripts/profiles/0.9.5/install/json-c.install: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ pkg_install() { 
    CURR="${SOURCE_DIR}/json-c"

    prepare_build_dir "${CURR}"

    cd "${CURR}/build"

    cmake -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" -DCMAKE_BUILD_TYPE:STRING=Release ..

    cmake -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ..

    make -j"${CORES}" install

    # Margo doesn't search in both directories, so we make it available in both lib and lib64

    if [[ -f "${INSTALL_DIR}/lib64/pkgconfig/json-c.pc" ]]; then

scripts/profiles/0.9.5/install/syscall_intercept.install

+1 −1
Changes for scripts/profiles/0.9.5/install/syscall_intercept.install: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ pkg_install() { 
    -DCMAKE_BUILD_TYPE:STRING=Debug \

    -DBUILD_EXAMPLES:BOOL=OFF \

    -DSTATIC_CAPSTONE:BOOL=OFF \

    -DBUILD_TESTS:BOOK=OFF ..

    -DBUILD_TESTS:BOOK=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ..

    make -j"${CORES}" install

    if [[ ${EXTRA_INSTALL_ARGS} == "ARM64" ]]; then

        cp "${CURR}"/arch/aarch64/include/libsyscall_intercept_hook_point.h ${INSTALL_DIR}/include

scripts/profiles/0.9.5/agios.specs

+3 −3
Changes for scripts/profiles/0.9.5/agios.specs: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -40,14 +40,14 @@ wgetdeps=( 
    ["lz4"]="1.9.4"

    ["capstone"]="6.0.0-Alpha1"

    ["argobots"]="1.2"

    ["rocksdb"]="8.10.0"

    ["rocksdb"]="10.4.2"

    ["json-c"]="0.17-20230812"

)



# Dependencies that must be cloned

clonedeps=(

    ["libfabric"]="HEAD@v1.20.1"

    ["mercury"]="v2.4.0"

    ["libfabric"]="HEAD@v2.2.0"

    ["mercury"]="v2.4.1rc1"

    ["margo"]="v0.18.3"

    ["syscall_intercept"]="d8b2a69961921ed123625c79a609331fc56a8931"

    ["agios"]="c26a6544200f823ebb8f890dd94e653d148bf226@development"