Fix #1014 build with ifx

krystophny · krystophny · commit cb55ff0d446d · 2025-04-08T22:38:30.000+02:00
diff --git a/.github/workflows/meta.yml b/.github/workflows/meta.yml
@@ -4,17 +4,17 @@ on:
   # On push, only run if any of the metapackage files has changed
   push:
     paths:
-      - 'src/*meta*.f90'  
+      - 'src/*meta*.f90'
       - 'src/fpm/*meta*.f90'
       - 'src/fpm/manifest/*meta*.f90'
       - 'src/ci/meta_tests.sh'
       - 'src/.github/workflows/meta.yml'
-  # Always run on PR or release 
+  # Always run on PR or release
   pull_request:
   release:
     types: [published]
   # Allow manual triggering
-  workflow_dispatch:  
+  workflow_dispatch:
 
 env:
   CI: "ON" # We can detect this in the build system and other vendors implement it
@@ -51,7 +51,7 @@ jobs:
 
     - name: (Ubuntu/macOS) setup gcc version
       if: contains(matrix.os,'ubuntu') || contains(matrix.os,'macos')
-      run: |      
+      run: |
         echo "GCC_V=14" >> $GITHUB_ENV
 
     - name: (Windows) Install MSYS2
@@ -84,7 +84,7 @@ jobs:
         Remove-Item "oneAPI" -Force -Recurse
 
     - name: (Ubuntu) Install gfortran
-      if: contains(matrix.os,'ubuntu') 
+      if: contains(matrix.os,'ubuntu')
       run: |
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \
         --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \
@@ -115,16 +115,16 @@ jobs:
       uses: fortran-lang/setup-fortran@v1.6.1
       id: setup-fortran
       with:
-        compiler: intel 
-        version: 2024.1.0 
+        compiler: intel
+        version: 2024.1.0
 
-    - name: (Ubuntu) finalize oneAPI environment 
+    - name: (Ubuntu) finalize oneAPI environment
       if: contains(matrix.os,'ubuntu') && contains(matrix.mpi,'intel')
       run: |
         # Install MPI
         sudo apt-get install -y -q intel-oneapi-mpi-devel ninja-build cmake
         source /opt/intel/oneapi/setvars.sh --force
-        printenv >> $GITHUB_ENV        
+        printenv >> $GITHUB_ENV
         # To run HDF5 with oneAPI, we need to build it from source. Use CMake to generate pkg-config info
         curl -O -L https://github.com/HDFGroup/hdf5/archive/refs/tags/snapshot-1.14.tar.gz
         tar zxf snapshot-1.14.tar.gz
@@ -214,8 +214,8 @@ jobs:
 
     - name: (macOS) Install homebrew HDF5
       if: contains(matrix.os,'macos')
-      run: | 
-        brew install hdf5 
+      run: |
+        brew install hdf5
 
     # Phase 1: Bootstrap fpm with existing version
     - name: Install fpm
@@ -229,8 +229,8 @@ jobs:
         mv $(which fpm) fpm-bootstrap${{ matrix.exe }}
         echo "BOOTSTRAP=$PWD/fpm-bootstrap" >> $GITHUB_ENV
 
-    - name: (macOS/Ubuntu) Use gcc/g++ instead of Clang for C/C++ / ifx to build fpm
-      if: contains(matrix.os,'macOS') || contains(matrix.os,'ubuntu')
+    - name: (macOS) Use gcc/g++ instead of Clang for C/C++ to build fpm
+      if: contains(matrix.os,'macOS')
       shell: bash
       run: |
         echo "FPM_FC=gfortran-${{ env.GCC_V }}" >> $GITHUB_ENV
diff --git a/src/fpm/cmd/new.f90 b/src/fpm/cmd/new.f90
@@ -627,7 +627,8 @@ end function git_metadata
 
 subroutine create_verified_basic_manifest(filename)
 !> create a basic but verified default manifest file
-use fpm_toml, only : toml_table, toml_serialize, set_value
+use tomlf, only : toml_table, toml_serialize
+use fpm_toml, only : set_value
 use fpm_manifest_package, only : package_config_t, new_package
 use fpm_error, only : error_t
 implicit none
diff --git a/src/fpm/dependency.f90 b/src/fpm/dependency.f90
@@ -65,8 +65,8 @@ module fpm_dependency
   use fpm_manifest_dependency, only: manifest_has_changed, dependency_destroy
   use fpm_manifest_preprocess, only: operator(==)
   use fpm_strings, only: string_t, operator(.in.)
-  use fpm_toml, only: toml_table, toml_key, toml_error, toml_serialize, &
-                      get_value, set_value, add_table, toml_load, toml_stat, set_string
+  use tomlf, only: toml_table, toml_key, toml_error, toml_load, toml_stat
+  use fpm_toml, only: toml_serialize, get_value, set_value, add_table, set_string
   use fpm_versioning, only: version_t, new_version
   use fpm_settings, only: fpm_global_settings, get_global_settings, official_registry_base_url
   use fpm_downloader, only: downloader_t
diff --git a/src/fpm/git.f90 b/src/fpm/git.f90
@@ -2,7 +2,8 @@
 module fpm_git
     use fpm_error, only: error_t, fatal_error
     use fpm_filesystem, only : get_temp_filename, getline, join_path, execute_and_read_output, run
-    use fpm_toml, only: serializable_t, toml_table, get_value, set_value, toml_stat, set_string
+    use tomlf, only: toml_table, toml_stat
+    use fpm_toml, only: serializable_t, get_value, set_value, set_string
     implicit none
 
     public :: git_target_t, git_target_default, git_target_branch, git_target_tag, git_target_revision, git_revision, &
@@ -434,7 +435,7 @@ subroutine git_archive(source, destination, ref, additional_files, verbose, erro
     end if
 
     allocate(character(len=0) :: add_files)
-    if (present(additional_files)) then 
+    if (present(additional_files)) then
        do i=1,size(additional_files)
           add_files = trim(add_files)//' --add-file='//adjustl(additional_files(i))
        end do
@@ -446,7 +447,7 @@ subroutine git_archive(source, destination, ref, additional_files, verbose, erro
         & -o '//destination, &
         & echo=verbose, &
         & exitstat=stat)
-        
+
     if (stat /= 0) then
       call fatal_error(error, "Error packing '"//source//"'."); return
     end if
diff --git a/src/fpm/manifest/build.f90 b/src/fpm/manifest/build.f90
@@ -12,8 +12,9 @@
 module fpm_manifest_build
     use fpm_error, only : error_t, syntax_error, fatal_error
     use fpm_strings, only : string_t, len_trim, is_valid_module_prefix, operator(==)
-    use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, get_list, serializable_t, &
-                         set_value, set_string, set_list
+    use tomlf, only: toml_table, toml_key, toml_stat
+    use fpm_toml, only : serializable_t, get_value, get_list, set_value, set_string, set_list
+
     implicit none
     private
 
diff --git a/src/fpm/manifest/dependency.f90 b/src/fpm/manifest/dependency.f90
@@ -26,7 +26,8 @@ module fpm_manifest_dependency
     use fpm_error, only: error_t, syntax_error, fatal_error
     use fpm_git, only: git_target_t, git_target_tag, git_target_branch, &
         & git_target_revision, git_target_default, git_matches_manifest
-    use fpm_toml, only: toml_table, toml_key, toml_stat, get_value, check_keys, serializable_t, add_table, &
+    use tomlf, only: toml_table, toml_key, toml_stat
+    use fpm_toml, only: get_value, check_keys, serializable_t, add_table, &
         & set_value, set_string
     use fpm_filesystem, only: windows_path, join_path
     use fpm_environment, only: get_os_type, OS_WINDOWS
diff --git a/src/fpm/manifest/example.f90 b/src/fpm/manifest/example.f90
@@ -18,7 +18,8 @@ module fpm_manifest_example
     use fpm_manifest_dependency, only : dependency_config_t, new_dependencies
     use fpm_manifest_executable, only : executable_config_t
     use fpm_error, only : error_t, syntax_error, bad_name_error
-    use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, get_list
+    use tomlf, only : toml_table, toml_key, toml_stat
+    use fpm_toml, only : get_value, get_list
     implicit none
     private
 
diff --git a/src/fpm/manifest/executable.f90 b/src/fpm/manifest/executable.f90
@@ -14,7 +14,8 @@ module fpm_manifest_executable
     use fpm_manifest_dependency, only : dependency_config_t, new_dependencies, resize
     use fpm_error, only : error_t, syntax_error, bad_name_error, fatal_error
     use fpm_strings, only : string_t, operator(==)
-    use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, get_list, serializable_t, add_table, &
+    use tomlf, only : toml_table, toml_key, toml_stat
+    use fpm_toml, only : get_value, get_list, serializable_t, add_table, &
                           set_string, set_list
     implicit none
     private
diff --git a/src/fpm/manifest/fortran.f90 b/src/fpm/manifest/fortran.f90
@@ -1,6 +1,7 @@
 module fpm_manifest_fortran
     use fpm_error, only : error_t, syntax_error, fatal_error
-    use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, serializable_t, set_value, set_string
+    use tomlf, only : toml_table, toml_key, toml_stat
+    use fpm_toml, only : get_value, serializable_t, set_value, set_string
     implicit none
     private
 
diff --git a/src/fpm/manifest/install.f90 b/src/fpm/manifest/install.f90
@@ -7,7 +7,8 @@
 !>```
 module fpm_manifest_install
   use fpm_error, only : error_t, fatal_error, syntax_error
-  use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, set_value, serializable_t
+  use tomlf, only : toml_table, toml_key, toml_stat
+  use fpm_toml, only : get_value, set_value, serializable_t
   implicit none
   private
 
@@ -18,7 +19,7 @@ module fpm_manifest_install
 
     !> Install library with this project
     logical :: library = .false.
-    
+
     !> Install tests with this project
     logical :: test = .false.
 
@@ -80,7 +81,7 @@ subroutine check(table, error)
         call syntax_error(error, "Key "//list(ikey)%key//" is not allowed in install table")
         exit
       case("library","test")
-        continue    
+        continue
       end select
     end do
     if (allocated(error)) return
@@ -150,7 +151,7 @@ subroutine dump_to_toml(self, table, error)
 
     call set_value(table, "library", self%library, error, class_name)
     if (allocated(error)) return
-    
+
     call set_value(table, "test", self%test, error, class_name)
     if (allocated(error)) return
 
diff --git a/src/fpm/manifest/library.f90 b/src/fpm/manifest/library.f90
@@ -11,7 +11,8 @@
 module fpm_manifest_library
     use fpm_error, only : error_t, syntax_error
     use fpm_strings, only: string_t, string_cat, operator(==)
-    use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, get_list, serializable_t, set_value, &
+    use tomlf, only : toml_table, toml_key, toml_stat
+    use fpm_toml, only : get_value, get_list, serializable_t, set_value, &
                           set_list, set_string, get_value, has_list
     implicit none
     private
@@ -63,8 +64,8 @@ subroutine new_library(self, table, error)
 
         call check(table, error)
         if (allocated(error)) return
-        
-        if (has_list(table, "source-dir")) then 
+
+        if (has_list(table, "source-dir")) then
             call syntax_error(error, "Manifest key [library.source-dir] does not allow list input")
             return
         end if
diff --git a/src/fpm/manifest/meta.f90 b/src/fpm/manifest/meta.f90
@@ -10,7 +10,8 @@
 !>```
 module fpm_manifest_metapackages
     use fpm_error, only: error_t, fatal_error, syntax_error
-    use fpm_toml, only : toml_table, toml_key, toml_stat, get_value
+    use tomlf, only : toml_table, toml_key, toml_stat
+    use fpm_toml, only : get_value
     use fpm_environment
     implicit none
     private
diff --git a/src/fpm/manifest/package.f90 b/src/fpm/manifest/package.f90
@@ -47,8 +47,8 @@ module fpm_manifest_package
     use fpm_manifest_metapackages, only: metapackage_config_t, new_meta_config
     use fpm_filesystem, only : exists, getline, join_path
     use fpm_error, only : error_t, fatal_error, syntax_error, bad_name_error
-    use fpm_toml, only : toml_table, toml_array, toml_key, toml_stat, get_value, len, &
-                         serializable_t, set_value, set_string, set_list, add_table
+    use tomlf, only : toml_table, toml_array, toml_key, toml_stat
+    use fpm_toml, only : get_value, len, serializable_t, set_value, set_string, set_list, add_table
     use fpm_versioning, only : version_t, new_version
     implicit none
     private
diff --git a/src/fpm/manifest/preprocess.f90 b/src/fpm/manifest/preprocess.f90
@@ -13,7 +13,8 @@
 module fpm_manifest_preprocess
    use fpm_error, only : error_t, syntax_error
    use fpm_strings, only : string_t, operator(==)
-   use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, get_list, serializable_t, set_value, set_list, &
+   use tomlf, only : toml_table, toml_key, toml_stat
+   use fpm_toml, only : get_value, get_list, serializable_t, set_value, set_list, &
                         set_string
    use,intrinsic :: iso_fortran_env, only : stderr=>error_unit
    implicit none
diff --git a/src/fpm/manifest/profiles.f90 b/src/fpm/manifest/profiles.f90
@@ -43,7 +43,8 @@
 !>
 module fpm_manifest_profile
     use fpm_error, only : error_t, syntax_error, fatal_error, fpm_stop
-    use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, serializable_t, set_value, &
+    use tomlf, only : toml_table, toml_key, toml_stat
+    use fpm_toml, only : get_value, serializable_t, set_value, &
                          set_string, add_table
     use fpm_strings, only: lower
     use fpm_environment, only: get_os_type, OS_UNKNOWN, OS_LINUX, OS_MACOS, OS_WINDOWS, &
diff --git a/src/fpm/manifest/test.f90 b/src/fpm/manifest/test.f90
@@ -18,7 +18,8 @@ module fpm_manifest_test
     use fpm_manifest_dependency, only : new_dependencies
     use fpm_manifest_executable, only : executable_config_t
     use fpm_error, only : error_t, syntax_error, bad_name_error
-    use fpm_toml, only : toml_table, toml_key, toml_stat, get_value, get_list
+    use tomlf, only : toml_table, toml_key, toml_stat
+    use fpm_toml, only : get_value, get_list
     implicit none
     private
 
diff --git a/src/fpm/toml.f90 b/src/fpm/toml.f90
@@ -337,29 +337,29 @@ subroutine read_package_file(table, manifest, error)
         end if
 
     end subroutine read_package_file
-    
+
     !> Check if an instance of the TOML data structure contains a list
     logical function has_list(table, key)
-    
+
         !> Instance of the TOML data structure
         type(toml_table), intent(inout) :: table
 
         !> Key to read from
         character(len=*), intent(in) :: key
 
         type(toml_array), pointer :: children
-        
+
         has_list = .false.
 
         if (.not.table%has_key(key)) return
 
         call get_value(table, key, children, requested=.false.)
-        
+
         ! There is an allocated list
         has_list = associated(children)
-        
+
     end function has_list
-    
+
 
     subroutine get_list(table, key, list, error)
 
diff --git a/src/fpm_compiler.F90 b/src/fpm_compiler.F90
@@ -43,7 +43,8 @@ module fpm_compiler
     & string_array_contains
 use fpm_manifest, only : package_config_t
 use fpm_error, only: error_t, fatal_error
-use fpm_toml, only: serializable_t, toml_table, set_string, set_value, toml_stat, get_value
+use tomlf, only: toml_table
+use fpm_toml, only: serializable_t, set_string, set_value, toml_stat, get_value
 use shlex_module, only: shlex_split => split
 implicit none
 public :: compiler_t, new_compiler, archiver_t, new_archiver, get_macros
diff --git a/src/fpm_model.f90 b/src/fpm_model.f90
@@ -39,7 +39,8 @@ module fpm_model
 use fpm_compiler, only: compiler_t, archiver_t, debug
 use fpm_dependency, only: dependency_tree_t
 use fpm_strings, only: string_t, str, len_trim, upper, operator(==)
-use fpm_toml, only: serializable_t, toml_table, toml_stat, set_value, set_list, get_value, &
+use tomlf, only: toml_table, toml_stat
+use fpm_toml, only: serializable_t, set_value, set_list, get_value, &
                     & get_list, add_table, toml_key, add_array, set_string
 use fpm_error, only: error_t, fatal_error
 use fpm_manifest_preprocess, only: preprocess_config_t
diff --git a/src/fpm_settings.f90 b/src/fpm_settings.f90
@@ -3,7 +3,8 @@ module fpm_settings
   use fpm_filesystem, only: exists, join_path, get_local_prefix, is_absolute_path, mkdir
   use fpm_environment, only: os_is_unix
   use fpm_error, only: error_t, fatal_error
-  use fpm_toml, only: toml_table, toml_error, toml_stat, get_value, toml_load, check_keys
+  use tomlf, only: toml_table, toml_error, toml_stat, toml_load
+  use fpm_toml, only: get_value, check_keys
   use fpm_os, only: get_current_directory, change_directory, get_absolute_path, convert_to_absolute_path
 
   implicit none
