patching binutils for macOS

webosbrew · Mar 4, 2024 · 4cefe35 · 4cefe35
1 parent 4548c01
commit 4cefe35
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ on:
 
 jobs:
   filter:
-    name: Select Build Host
+    name: Select Build Targets
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.set-matrix.outputs.result }}

diff --git a/package/binutils/CMakeLists.txt b/package/binutils/CMakeLists.txt
@@ -1,11 +1,18 @@
 set(BINUTILS_VERSION 2.38)
 
+if (APPLE OR BSD)
+    list(APPEND BINUTILS_PATCHES "${CMAKE_CURRENT_SOURCE_DIR}/fix-build.macos.patch")
+endif ()
+
+list(TRANSFORM BINUTILS_PATCHES PREPEND "COMMAND;patch;-p1;<;" OUTPUT_VARIABLE BINUTILS_PATCH_COMMANDS)
+
 set(SYSROOT "${CMAKE_STAGING_PREFIX}/${GNU_TARGET_NAME}/sysroot")
 
 ExternalProject_Add(binutils DEPENDS sysroot
         INSTALL_DIR "${CMAKE_STAGING_PREFIX}"
         URL "${GNU_MIRROR}/binutils/binutils-${BINUTILS_VERSION}.tar.bz2"
         DOWNLOAD_EXTRACT_TIMESTAMP TRUE
+        PATCH_COMMAND ${BINUTILS_PATCH_COMMANDS}
         CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --sysconfdir=<INSTALL_DIR>/etc --disable-multilib
             --disable-werror --target=${GNU_TARGET_NAME} --disable-shared --enable-static --with-sysroot=${SYSROOT}
             --enable-poison-system-directories --without-debuginfod --enable-plugins --enable-lto --disable-sim

diff --git a/package/binutils/fix-build.macos.patch b/package/binutils/fix-build.macos.patch
@@ -0,0 +1,15 @@
+diff --git a/gold/gold-threads.cc b/gold/gold-threads.cc
+--- a/gold/gold-threads.cc	(date 1642853649000)
++++ b/gold/gold-threads.cc	(date 1709531784143)
+@@ -285,8 +285,9 @@
+ {
+  public:
+   Once_initialize()
+-    : once_(PTHREAD_ONCE_INIT)
+-  { }
++  {
++      this->once_ = PTHREAD_ONCE_INIT;
++  }
+
+   // Return a pointer to the pthread_once_t variable.
+   pthread_once_t*