From e05c09e305055cc16b2d920e6f94fe9c32e8d378 Mon Sep 17 00:00:00 2001 From: Mateusz Pietryga Date: Wed, 27 Nov 2024 19:19:26 +0100 Subject: [PATCH 1/7] Update JDK used for cross compilation as JDK11 is no longer part of Dockcross repository after rebasing to Debian Bookworm --- .github/workflows/cross-compile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml index b9da06f2e..3e7fc8698 100644 --- a/.github/workflows/cross-compile.yml +++ b/.github/workflows/cross-compile.yml @@ -117,7 +117,7 @@ jobs: --env MAVEN_OPTS=${MAVEN_OPTS} \ ${{ matrix.image }} \ bash -c \ - 'apt-get update && apt-get install --yes maven openjdk-11-jdk-headless && \ + 'apt-get update && apt-get install --yes maven openjdk-17-jdk-headless && \ mvn -B clean install -P dockcross,update-resources-precompiled \ -Dos.target.name=${{ matrix.os_target_name }} \ -Dos.target.arch=${{ matrix.os_target_arch }} \ From 263ce36fef1adeebe35be15ad7c400663bab1644 Mon Sep 17 00:00:00 2001 From: Mateusz Pietryga Date: Wed, 27 Nov 2024 20:33:22 +0100 Subject: [PATCH 2/7] Update MacOS runner used for cross compilation build in Github Actions after deprecating macos-11 --- .github/workflows/cross-compile.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml index 3e7fc8698..1bacaba57 100644 --- a/.github/workflows/cross-compile.yml +++ b/.github/workflows/cross-compile.yml @@ -134,7 +134,7 @@ jobs: while git pull --rebase && ! git push; do sleep 5; done macos: - runs-on: macos-11 + runs-on: macos-latest needs: create-branch strategy: matrix: @@ -160,16 +160,18 @@ jobs: distribution: temurin - name: Get oldest supported SDK - if: ${{ matrix.sdk-version == 'MacOSX10.9.sdk' }} run: | - wget -qO- https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX10.9.sdk.tar.xz \ - | tar -xjv -C $XCODE_12_DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs + wget -qO- https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/${{ matrix.sdk-version }}.tar.xz \ + | tar -xjv -C $XCODE_16_DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs - name: Set SDK version run: | export MACOSX_DEPLOYMENT_TARGET=${{ matrix.macos-deployment-target }} - export SDKROOT=$XCODE_12_DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/${{ matrix.sdk-version }} + export SDKROOT=$XCODE_16_DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/${{ matrix.sdk-version }} export CMAKE_OSX_SYSROOT=$SDKROOT + echo "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" >> $GITHUB_ENV + echo "SDKROOT=$SDKROOT" >> $GITHUB_ENV + echo "CMAKE_OSX_SYSROOT=$CMAKE_OSX_SYSROOT" >> $GITHUB_ENV - name: Build with Maven run: mvn -B clean install -P ${{ matrix.profile }},update-resources-precompiled From 55338a2fc85b8cc1280302d49227223c691c81a0 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Tue, 10 Dec 2024 14:18:06 -0500 Subject: [PATCH 3/7] Echo minos value of binary when compiling for macOS --- ant/build.xml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/ant/build.xml b/ant/build.xml index 9fa2b07bf..62b934ffa 100644 --- a/ant/build.xml +++ b/ant/build.xml @@ -224,7 +224,7 @@ - + File information: @@ -239,22 +239,21 @@ - - + + - - - - - + + + + - + From 8028167b3bdcc61e2c435109af93191e6994001b Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Tue, 10 Dec 2024 14:26:14 -0500 Subject: [PATCH 4/7] Echo's finicky, use `cd .` instead --- ant/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ant/build.xml b/ant/build.xml index 62b934ffa..c35247ce1 100644 --- a/ant/build.xml +++ b/ant/build.xml @@ -247,7 +247,7 @@ - + From b9fc2dc6da455b38b4ce4cce068ae4a9a8e52ed8 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Fri, 20 Dec 2024 12:22:01 -0500 Subject: [PATCH 5/7] Fix minos for older SDKs --- ant/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ant/build.xml b/ant/build.xml index c35247ce1..d7c213710 100644 --- a/ant/build.xml +++ b/ant/build.xml @@ -247,7 +247,7 @@ - + From c7eecb2ee1f8ae10061844530c5d702e3c9e0e65 Mon Sep 17 00:00:00 2001 From: Tres Finocchiaro Date: Fri, 20 Dec 2024 13:15:58 -0500 Subject: [PATCH 6/7] Add CXX11 flag --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c7ab0cb24..f394535e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,6 +54,9 @@ if(APPLE) endif() endif() +set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + # Statically link gcc/c++ if(MSVC) # /MT = Multithread, static version of the run-time library From 783c326c89ddba4ecc4e77e0ae9ffabba33cee5b Mon Sep 17 00:00:00 2001 From: Mateusz Pietryga Date: Fri, 20 Dec 2024 20:28:07 +0100 Subject: [PATCH 7/7] Set up OSX build environment running main CI test pipeline for compatibility with older SDKs --- .github/workflows/build.yml | 19 +++++++++++++++++++ .github/workflows/cross-compile.yml | 2 ++ 2 files changed, 21 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2cd1f016..a38e03301 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,7 +58,11 @@ jobs: matrix: include: - profile: aarch64 + macos-deployment-target: 11.0 + sdk-version: MacOSX11.0.sdk - profile: x86_64 + macos-deployment-target: 10.8 + sdk-version: MacOSX10.9.sdk steps: - uses: actions/checkout@v3 @@ -68,6 +72,21 @@ jobs: distribution: temurin - run: brew install socat + + - name: Get oldest supported SDK + run: | + wget -qO- https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/${{ matrix.sdk-version }}.tar.xz \ + | tar -xjv -C $XCODE_16_DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs + + - name: Set SDK version + run: | + export MACOSX_DEPLOYMENT_TARGET=${{ matrix.macos-deployment-target }} + export SDKROOT=$XCODE_16_DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/${{ matrix.sdk-version }} + export CMAKE_OSX_SYSROOT=$SDKROOT + echo "MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET" >> $GITHUB_ENV + echo "SDKROOT=$SDKROOT" >> $GITHUB_ENV + echo "CMAKE_OSX_SYSROOT=$CMAKE_OSX_SYSROOT" >> $GITHUB_ENV + - run: mvn -P "${{ matrix.profile }}" --batch-mode windows: diff --git a/.github/workflows/cross-compile.yml b/.github/workflows/cross-compile.yml index 1bacaba57..bf80fe904 100644 --- a/.github/workflows/cross-compile.yml +++ b/.github/workflows/cross-compile.yml @@ -159,6 +159,8 @@ jobs: java-version: 11 distribution: temurin + - run: brew install socat + - name: Get oldest supported SDK run: | wget -qO- https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/${{ matrix.sdk-version }}.tar.xz \