Fix for MacOS CI on GitHub.

argonne-lcf · May 7, 2024 · 11128a0 · 11128a0
1 parent d5d63ac
commit 11128a0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml
@@ -33,7 +33,7 @@ jobs:
       - uses: actions/checkout@v3
       - run: sudo apt update; sudo apt install -y ${{ matrix.compiler }} ruby-dev libgsl-dev python3-dev valgrind
         if: ${{ matrix.os == 'ubuntu-latest' }}
-      - run: brew install gsl automake
+      - run: brew install gsl automake libtool
         if: ${{ matrix.os == 'macos-latest' }}
       - uses: actions/setup-python@v4
         with:
@@ -76,7 +76,7 @@ jobs:
       - uses: actions/checkout@v4
       - run: sudo apt update; sudo apt install -y gcc ruby-dev libgsl-dev python3-dev
         if: ${{ matrix.os == 'ubuntu-latest' }}
-      - run: brew install gsl automake
+      - run: brew install gsl automake libtool
         if: ${{ matrix.os == 'macos-latest' }}
       - uses: actions/setup-python@v4
         with:
@@ -104,7 +104,7 @@ jobs:
       - uses: actions/checkout@v4
       - run: sudo apt update; sudo apt install -y gcc ruby-dev libgsl-dev python3-dev
         if: ${{ matrix.os == 'ubuntu-latest' }}
-      - run: brew install gsl automake
+      - run: brew install gsl automake libtool
         if: ${{ matrix.os == 'macos-latest' }}
       - uses: actions/setup-python@v4
         with:

diff --git a/bindings/python/cconfigspace/base.py b/bindings/python/cconfigspace/base.py
@@ -434,8 +434,10 @@ def _ccs_get_function(method, argtypes = [], restype = Result):
 ccs_object_deserialize_callback_type = ct.CFUNCTYPE(Result, ccs_object, ct.c_size_t, ct.c_void_p, ct.c_void_p)
 # Variadic methods
 ccs_object_serialize = getattr(libcconfigspace, "ccs_object_serialize")
+ccs_object_serialize.argtypes = ccs_object, SerializeFormat, SerializeOperation,
 ccs_object_serialize.restype = Result
 ccs_object_deserialize = getattr(libcconfigspace, "ccs_object_deserialize")
+ccs_object_deserialize.argtypes = ct.POINTER(ccs_object), SerializeFormat, SerializeOperation,
 ccs_object_deserialize.restype = Result
 
 _res = ccs_init()

diff --git a/connectors/kokkos/Makefile.am b/connectors/kokkos/Makefile.am
@@ -1,5 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir)/include
-AM_CXXFLAGS = -Wall -Wextra -Wpedantic
+AM_CXXFLAGS = -Wall -Wextra -Wpedantic $(GSL_CFLAGS)
 
 if STRICT
 AM_CXXFLAGS += -Werror

diff --git a/samples/Makefile.am b/samples/Makefile.am
@@ -1,6 +1,6 @@
 AM_COLOR_TESTS = yes
 
-test_ruby_CFLAGS = -I$(top_srcdir)/include -Wall -Wextra $(RUBY_CFLAGS) -Wno-deprecated-declarations
+test_ruby_CFLAGS = -I$(top_srcdir)/include -Wall -Wextra $(GSL_CFLAGS) $(RUBY_CFLAGS) -Wno-deprecated-declarations
 
 if !ISMACOS
 if STRICT
@@ -10,7 +10,7 @@ endif
 
 test_ruby_LDFLAGS = ../src/libcconfigspace.la $(RUBY_LIBS)
 
-test_python_CFLAGS = -I$(top_srcdir)/include -Wall -Wextra -Wpedantic $(PYTHON_CFLAGS) -DBINDINGS_PATH="\"$(top_srcdir)/bindings/python\""
+test_python_CFLAGS = -I$(top_srcdir)/include -Wall -Wextra -Wpedantic $(GSL_CFLAGS) $(PYTHON_CFLAGS) -DBINDINGS_PATH="\"$(top_srcdir)/bindings/python\""
 
 if STRICT
 test_python_CFLAGS += -Werror