Patch macOS Intel GMP

Signed-off-by: Panagiotis Georgiadis <pgeorgia@redhat.com>

Author: drpaneas

.github/workflows/build.yml

@@ -67,17 +67,11 @@ jobs:
     - uses: actions/setup-python@v5
       with:
         python-version: '3.x'
-    - name: Install dependencies
-      run: |
-        brew install automake texinfo gmp
-        GMP_PREFIX=$(brew --prefix gmp)
-        echo "PKG_CONFIG_PATH=$GMP_PREFIX/lib/pkgconfig" >> $GITHUB_ENV
-        echo "CPPFLAGS=-I$GMP_PREFIX/include" >> $GITHUB_ENV
-        echo "LDFLAGS=-L$GMP_PREFIX/lib" >> $GITHUB_ENV
     - name: Build
       run: |
         git config --global user.email "builds@travis-ci.com"
         git config --global user.name "Travis CI"
+        brew install automake texinfo
         mkdir -p build
         cd build
         cmake ..

CMakeLists.txt

@@ -213,19 +213,21 @@ function(toolchain_deps toolchain_deps_dir toolchain_install_dir toolchain_suffi
         "CFLAGS=-DYAML_DECLARE_STATIC"
         )
 
-    # GMP assembly doesn't work on ARM64 macOS - need to disable it
-    if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" AND ${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "arm64")
+    # GMP assembly causes issues on macOS - need to disable it and use PIC
+    if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
         set(gmp_asm_flag --disable-assembly)
+        set(gmp_pic_flags "CFLAGS=-fPIC -fexceptions" "CXXFLAGS=-fPIC")
     else()
         set(gmp_asm_flag "")
+        set(gmp_pic_flags "CPPFLAGS=-fexceptions")
     endif()
 
     ExternalProject_add(gmp${suffix}
         URL https://ftpmirror.gnu.org/gnu/gmp/gmp-${GMP_VERSION}.tar.bz2
         URL_HASH ${GMP_HASH}
         DOWNLOAD_DIR ${DOWNLOAD_DIR}
         PATCH_COMMAND sh ${PROJECT_SOURCE_DIR}/cmake/update_config_files.sh <SOURCE_DIR>
-        CONFIGURE_COMMAND CPPFLAGS=-fexceptions ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
+        CONFIGURE_COMMAND ${gmp_pic_flags} ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
         --build=${build_native}
         --host=${toolchain_host}
         --prefix=${toolchain_deps_dir}