Skip to content

fix for gcc16 in libflap + minor improvement in meson build system #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mjv500 merged 2 commits into from
Aug 17, 2026
Merged

fix for gcc16 in libflap + minor improvement in meson build system #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e190a7a
fix for gcc16 in libflap (see https://github.com/szaghi/FLAP/commit/8…
MMignolet Jul 7, 2026
e2f5260
Merge branch 'main' into fix_libflap_gcc16
mjv500 Aug 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,20 @@ endif
# 2) try blas/openblas + lapack otherwise
if not dep_linalg_found
dep_blas = dependency('blas', required: false)
if not dep_blas.found()
if dep_blas.found()
dep_blas_vendor = 'blas'
else
message('Did not find the blas library. Trying with openblas')
dep_blas = dependency('openblas', required: true) # required as it is the last try
dep_blas_vendor = 'openblas'
endif

if dep_blas_vendor == 'openblas'
dep_linalg = [dep_blas] # openblas already provides a lapack implementation
else
dep_lapack = dependency('lapack', required: true)
dep_linalg = [dep_blas, dep_lapack]
endif
dep_lapack = dependency('lapack', required: true)
dep_linalg = [dep_blas, dep_lapack]
endif
# # add some common path to pkg-config search path
# env = environ()
Expand Down
2 changes: 1 addition & 1 deletion src/libflap/flap_command_line_argument_t.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,7 +1434,7 @@ subroutine get_cla_list_varying_char(self, val, pref)
!---------------------------------------------------------------------------------------------------------------------------------
endsubroutine get_cla_list_varying_char

elemental subroutine cla_assign_cla(lhs, rhs)
subroutine cla_assign_cla(lhs, rhs)
!---------------------------------------------------------------------------------------------------------------------------------
!< Assignment operator.
!---------------------------------------------------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/libflap/flap_command_line_arguments_group_t.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ subroutine sanitize_defaults(self)
!---------------------------------------------------------------------------------------------------------------------------------
endsubroutine sanitize_defaults

elemental subroutine clasg_assign_clasg(lhs, rhs)
subroutine clasg_assign_clasg(lhs, rhs)
!---------------------------------------------------------------------------------------------------------------------------------
!< Assignment operator.
!---------------------------------------------------------------------------------------------------------------------------------
Expand Down
12 changes: 7 additions & 5 deletions src/libflap/flap_command_line_interface_t.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,8 @@ subroutine add_group(self, help, description, exclude, group)
clasg_list_new(Ng)%description = descriptiond
clasg_list_new(Ng)%group = group
clasg_list_new(Ng)%m_exclude = excluded
deallocate(self%clasg)
allocate(self%clasg(0:Ng))
self%clasg = clasg_list_new
if (allocated(self%clasg)) deallocate(self%clasg)
allocate(self%clasg(lbound(clasg_list_new,1):ubound(clasg_list_new,1)), source=clasg_list_new)
deallocate(clasg_list_new)
endif
return
Expand Down Expand Up @@ -1707,7 +1706,7 @@ subroutine errored(self, error, pref, group, switch)
!---------------------------------------------------------------------------------------------------------------------------------
endsubroutine errored

elemental subroutine cli_assign_cli(lhs, rhs)
subroutine cli_assign_cli(lhs, rhs)
!---------------------------------------------------------------------------------------------------------------------------------
!< Assignment operator.
!---------------------------------------------------------------------------------------------------------------------------------
Expand All @@ -1719,7 +1718,10 @@ elemental subroutine cli_assign_cli(lhs, rhs)
! object members
call lhs%assign_object(rhs)
! command_line_interface members
if (allocated(rhs%clasg )) lhs%clasg = rhs%clasg
if (allocated(rhs%clasg)) then
if (allocated(lhs%clasg)) deallocate(lhs%clasg)
allocate(lhs%clasg(lbound(rhs%clasg,1):ubound(rhs%clasg,1)), source=rhs%clasg)
endif
if (allocated(rhs%examples)) lhs%examples = rhs%examples
lhs%disable_hv = rhs%disable_hv
return
Expand Down
Loading