Merge SVN 5252

.github/workflows/macos.yml

@@ -59,7 +59,6 @@ jobs:
 
       - name: bootstrap
         run: |
-          sed -i '' 's/-undefined suppress//g' configure.ac
           ./build_aux/bootstrap install
 
       - name: Build environment setup

ChangeLog

@@ -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

NEWS

@@ -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

configure.ac

@@ -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])])
@@ -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

libcob/ChangeLog

@@ -59,6 +59,30 @@
 	* common.h [__MINGW32__]: drop ancient redefinition of
 	  strcasecmp and strncasecmp
 
+2024-03-10  Alfredo Tupone <[email protected]>
+
+	* common.c: add missing include libxml/parser.h
+
+2024-01-30  Ron Norman <[email protected]>
+
+	* fisam.c: Updated to set index field type for 'short' & 'int'
+	  Enabled support for variable length records is using V-ISAM/D-ISAM
+
+2023-06-02  Simon Sobisch <[email protected]>
+
+	* fsqlxfd.c (cob_findkey_attr), fileio.c, fisam.c: extracted identical
+	  logic from cob_findkey, indexed_findkey and db_findkey;
+	  dropping the later two and set mapkey after calling it
+	* Makefile.am: link fsqlxfd into all libraries (may be adjusted later)
+	* fileio.c (cob_file_create), common.h: prefer relevant enums over int
+	* fileio.c (cob_file_sort_using, cob_file_sort_giving): raise
+	  COB_EC_SORT_MERGE_FILE_OPEN when applicable
+	* fileio.c (cob_copy_check, cob_file_sort_submit, cob_file_sort_retrieve):
+	  pass most matching argument type instead of the structures containing it
+	* fileio.c (cobsort): new attribute flag_merge
+	* fileio.c (cob_file_sort_options), common.h: new function to pass more
+	  options, so far only used to set flag_merge
+
 2023-04-27  Simon Sobisch <[email protected]>
 
 	* move.c (cob_move_display_to_packed), numeric.c (cob_decimal_get_packed):
@@ -93,30 +117,6 @@
 	* numeric.c (cob_decimal_get_packed): set by optimized integer routine
 	  when possible
 
-2024-03-10  Alfredo Tupone <[email protected]>
-
-	* common.c: add missing include libxml/parser.h
-
-2024-01-30  Ron Norman <[email protected]>
-
-	* fisam.c: Updated to set index field type for 'short' & 'int'
-	  Enabled support for variable length records is using V-ISAM/D-ISAM
-
-2023-06-02  Simon Sobisch <[email protected]>
-
-	* fsqlxfd.c (cob_findkey_attr), fileio.c, fisam.c: extracted identical
-	  logic from cob_findkey, indexed_findkey and db_findkey;
-	  dropping the later two and set mapkey after calling it
-	* Makefile.am: link fsqlxfd into all libraries (may be adjusted later)
-	* fileio.c (cob_file_create), common.h: prefer relevant enums over int
-	* fileio.c (cob_file_sort_using, cob_file_sort_giving): raise
-	  COB_EC_SORT_MERGE_FILE_OPEN when applicable
-	* fileio.c (cob_copy_check, cob_file_sort_submit, cob_file_sort_retrieve):
-	  pass most matching argument type instead of the structures containing it
-	* fileio.c (cobsort): new attribute flag_merge
-	* fileio.c (cob_file_sort_options), common.h: new function to pass more
-	  options, so far only used to set flag_merge
-
 2023-04-17  Simon Sobisch <[email protected]>
 
 	* numeric.c (cob_decimal_setget_fld, cob_decimal_get_packed,

libcob/fextfh.c

@@ -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