Fixups

Author: ddeclerck

.github/workflows/macos.yml

@@ -27,11 +27,11 @@ jobs:
 
       - name: Install packages
         run: |
-          brew install automake libtool help2man texinfo bison berkeley-db@4 json-c
+          brew install automake libtool help2man texinfo bison berkeley-db@4 json-c libiconv
           opt="/opt/homebrew/opt"
           echo "$opt/pkg-config/bin" >> $GITHUB_PATH
-          echo "LDFLAGS=-L$opt/berkeley-db@4/lib ${LDFLAGS}" >> $GITHUB_ENV
-          echo "CPPFLAGS=-I$opt/berkeley-db@4/include ${CPPFLAGS}" >> $GITHUB_ENV
+          echo "LDFLAGS=-L$opt/berkeley-db@4/lib -L$opt/libiconv/lib ${LDFLAGS}" >> $GITHUB_ENV
+          echo "CPPFLAGS=-I$opt/berkeley-db@4/include -I$opt/libiconv/include ${CPPFLAGS}" >> $GITHUB_ENV
 
       - name: Set git user
         run: |
@@ -41,6 +41,7 @@ jobs:
       - name: bootstrap
         run: |
           ./build_aux/bootstrap install
+          gettextize -f
 
       - name: Build environment setup
         run: |

.github/workflows/windows-msvc.yml

@@ -136,6 +136,15 @@ jobs:
             })  -join "`r`n"  ) | Set-Content -Path 'config.h'
           & .\maketarstamp.ps1 > tarstamp.h
 
+      - name: Disable iconv for debug builds
+        if: ${{ matrix.target == 'Debug' }}
+        shell: pwsh
+        run: |
+          cd build_windows
+          ((Get-Content -Path 'config.h' | ForEach-Object { $_ `
+              -replace '(#define\s+HAVE_ICONV)\s.+$', '/* #undef HAVE_ICONV */' `
+            })  -join "`r`n"  ) | Set-Content -Path 'config.h'
+
       - name: Generate parser
         run: |
           set PATH=%GITHUB_WORKSPACE%\flexbison;%PATH%
@@ -220,13 +229,13 @@ jobs:
           echo wrap up GnuCBOBOL binary package
           rem set CL=
           cmd /C build_windows\makedist.cmd ${{ matrix.target }} <NUL
-          
+
       - name: Upload dependencies
         uses: actions/upload-artifact@v4
         with:
           name: VCPKG ${{ matrix.arch }}-${{ matrix.target }} dependencies
           path: dependencies-${{ matrix.arch }}.7z
-          
+
       - name: Upload distribution
         uses: actions/upload-artifact@v4
         with:

cobc/gentable.c

@@ -23,6 +23,7 @@
 #include "tree.h" /* for cb_note */
 
 #include <stdio.h>
+#include <string.h>
 
 #ifdef HAVE_ICONV
 
@@ -82,6 +83,8 @@ gentable (FILE *stream, const char *code_ebcdic, const char *code_ascii, char re
 			if (res == (size_t)-1) {
 				if (errno == EILSEQ) {
 					/* GNU iconv: an untranslatable character was met */
+					/* FIXME: when using the vcpkg port of GNU iconv under an
+					   MSVC debug build, the value of errno remains 0... */
 					*ascii_ptr = ASCII_SUBST_CHAR;
 					++ebcdic_ptr; ++ascii_ptr;
 					--ascii_size;