Skip to content

Commit

Permalink
Merge SVN 5295
Browse files Browse the repository at this point in the history
  • Loading branch information
ddeclerck committed Nov 7, 2024
1 parent 02963ae commit 7a1dd19
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 4 deletions.
1 change: 0 additions & 1 deletion .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ jobs:
- name: bootstrap
run: |
sed -i '' 's/-undefined suppress//g' configure.ac
./build_aux/bootstrap install
- name: Build environment setup
Expand Down
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@

* configure.ac: replace AC_ARG_VAR by AC_SUBST where appropriate

2024-05-14 David Declerck <[email protected]>

* configure.ac: update flags for building dynamic libraries on macOS
(helps fixing testsuite issues on recent macOS versions)

2023-04-25 Simon Sobisch <[email protected]>

* configure.ac: try to error on warnings during checks, cleanup of resulting
Expand Down
2 changes: 2 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ NEWS - user visible changes -*- outline -*-
where the old default GnuCOBOL data files could be unusable if copied between
systems of different hardware architecture.

** use the "default" -shared flag to build dynamic libraries on macOS
so as to fix testuite issues with recent macOS versions

** dialect option to allow ref-mod with zero-length (active with -std=default),
with runtime checks enabled; also set by directives
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2439,7 +2439,7 @@ if test "$COB_USES_CLANG_ONLY" = yes; then
# don't warn for untyped function call - only possible if the interal repository would be enforced
curr_cflags="$CFLAGS"
CFLAGS="$CFLAGS -Wdeprecated-non-prototype $ERRWARN"
AC_MSG_CHECKING([for need to suppress clang ürototype warning])
AC_MSG_CHECKING([for need to suppress clang prototype warning])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[return 0;]])],
[COB_CFLAGS="$COB_CFLAGS -Wno-deprecated-non-prototype"; AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])])
Expand Down Expand Up @@ -2507,7 +2507,7 @@ case $host_os in
fi
#COB_FIX_LIB=""
;;
darwin* | rhapsody*)
rhapsody*)
if test "$COB_USES_GCC" = yes; then
COB_SHARED_OPT="-bundle -flat_namespace -undefined suppress"
fi
Expand Down
2 changes: 1 addition & 1 deletion libcob/fextfh.c
Original file line number Diff line number Diff line change
Expand Up @@ -1367,7 +1367,7 @@ EXTFH (unsigned char *opcode, FCD3 *fcd)
}
#if !COB_64_BIT_POINTER
if (fcd->fcdVer == FCD2_VER) {
int rtnstsn;
int rtnsts;
#if 0
int opcd;
#endif
Expand Down

0 comments on commit 7a1dd19

Please sign in to comment.