diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index 830a631..53cb6bd 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -4,7 +4,7 @@ on:
   push:
 
 env:
-  CACHE_VERSION: 11
+  CACHE_VERSION: 12
   DEBIAN_FRONTEND: noninteractive
   PAWPAW_SKIP_TESTS: 1
 
@@ -31,6 +31,24 @@ jobs:
             os: macos-13
           - target: macos-universal-10.15
             os: macos-13
+          # macos 14
+          - target: macos
+            os: macos-14
+          - target: macos-10.15
+            os: macos-14
+          - target: macos-universal
+            os: macos-14
+          - target: macos-universal-10.15
+            os: macos-14
+          # macos 15
+          - target: macos
+            os: macos-15
+          - target: macos-10.15
+            os: macos-15
+          - target: macos-universal
+            os: macos-15
+          - target: macos-universal-10.15
+            os: macos-15
           # debian:11
           - target: linux-aarch64
             container: debian:11
diff --git a/bootstrap-common.sh b/bootstrap-common.sh
index bd143f9..cf495d5 100755
--- a/bootstrap-common.sh
+++ b/bootstrap-common.sh
@@ -294,6 +294,8 @@ fi
 # ---------------------------------------------------------------------------------------------------------------------
 # pkgconfig
 
+export EXTRA_CFLAGS="-Wno-int-conversion"
+
 download pkg-config "${PKG_CONFIG_VERSION}" "${PKG_CONFIG_URL}"
 build_host_autoconf pkg-config "${PKG_CONFIG_VERSION}" "--enable-indirect-deps --with-internal-glib --with-pc-path=${TARGET_PKG_CONFIG_PATH}"
 
diff --git a/setup/functions.sh b/setup/functions.sh
index 1ec4512..06804f5 100644
--- a/setup/functions.sh
+++ b/setup/functions.sh
@@ -655,10 +655,11 @@ function build_host_autoconf() {
     unset CXX
     unset LD
     unset STRIP
-    unset CFLAGS
     unset CPPFLAGS
-    unset CXXFLAGS
-    unset LDFLAGS
+
+    export CFLAGS="${EXTRA_CFLAGS}"
+    export CXXFLAGS="${EXTRA_CXXFLAGS}"
+    export LDFLAGS="${EXTRA_LDFLAGS}"
 
     if [ -e "${PAWPAW_ROOT}/patches/${pkgname}" ] && [ ! -f "${pkgdir}/.stamp_cleanup" ] && [ ! -f "${pkgdir}/.stamp_configured" ]; then
         local patchtargets="${PAWPAW_TARGET}"
@@ -709,6 +710,10 @@ function build_host_autoconf() {
         touch .stamp_installed
         popd
     fi
+
+    unset CFLAGS
+    unset CXXFLAGS
+    unset LDFLAGS
 }
 
 function build_host_cmake() {