Fix MacOS CI

OCamlPro · May 13, 2024 · 704a0c1 · 704a0c1
1 parent 5ba97ae
commit 704a0c1
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -26,9 +26,9 @@ jobs:
 
       - name: Install packages
         run: |
-          brew install automake help2man texinfo bison berkeley-db@4
+          brew install automake libtool help2man texinfo bison berkeley-db@4
           opt="/usr/local/opt"; \
-          for d in automake help2man bison texinfo berkeley-db@4; do \
+          for d in automake libtool help2man bison texinfo berkeley-db@4; do \
             test -d "$opt/$d/bin" && echo "$opt/$d/bin" >> $GITHUB_PATH; \
             test -d "$opt/$d/lib" && export LDFLAGS="-L$opt/$d/lib $LDFLAGS"; \
             test -d "$opt/$d/include" && export CPPFLAGS="-I$opt/$d/include $CPPFLAGS"; \
@@ -53,18 +53,20 @@ jobs:
           echo "NPROC=`sysctl -n hw.ncpu`" >> $GITHUB_ENV
           export TERM="vt100"
           echo "TERM=$TERM" >> $GITHUB_ENV
-
       - name: configure
         run: |
           cd _build
-          ../configure --enable-cobc-internal-checks --enable-hardening --prefix /opt/cobol/gnucobol-gcos --exec-prefix /opt/cobol/gnucobol-gcos
+          export COB_SHARED_OPT="-bundle -flat_namespace"
+          export BDB_CFLAGS="-I/opt/homebrew/opt/berkeley-db@4/include"
+          export BDB_LIBS="-L/opt/homebrew/opt/berkeley-db@4/lib -ldb"
+          ../configure COB_SHARED_OPT="-bundle -flat_namespace" --enable-cobc-internal-checks --enable-hardening --prefix /opt/cobol/gnucobol-gcos --exec-prefix /opt/cobol/gnucobol-gcos
 
       - name: Upload config.log
         uses: actions/upload-artifact@v3
         with:
           name: config.log
           path: _build/config.log
-#       if: failure()
+        if: always()
 
       - name: make
         run: |