From cdf3ec0f482feff735bd2b347cb9b2596903d6e0 Mon Sep 17 00:00:00 2001 From: Andrew D Smith Date: Tue, 18 Nov 2025 14:32:55 -0800 Subject: [PATCH 1/2] m4/ax_cxx_compile_stdcxx_17.m4: replacing with general script --- m4/ax_cxx_compile_stdcxx_17.m4 | 35 ---------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 m4/ax_cxx_compile_stdcxx_17.m4 diff --git a/m4/ax_cxx_compile_stdcxx_17.m4 b/m4/ax_cxx_compile_stdcxx_17.m4 deleted file mode 100644 index a6834171..00000000 --- a/m4/ax_cxx_compile_stdcxx_17.m4 +++ /dev/null @@ -1,35 +0,0 @@ -# ============================================================================= -# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_17.html -# ============================================================================= -# -# SYNOPSIS -# -# AX_CXX_COMPILE_STDCXX_17([ext|noext], [mandatory|optional]) -# -# DESCRIPTION -# -# Check for baseline language coverage in the compiler for the C++17 -# standard; if necessary, add switches to CXX and CXXCPP to enable -# support. -# -# This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX -# macro with the version set to C++17. The two optional arguments are -# forwarded literally as the second and third argument respectively. -# Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for -# more information. If you want to use this macro, you also need to -# download the ax_cxx_compile_stdcxx.m4 file. -# -# LICENSE -# -# Copyright (c) 2015 Moritz Klammler -# Copyright (c) 2016 Krzesimir Nowak -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 2 - -AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX]) -AC_DEFUN([AX_CXX_COMPILE_STDCXX_17], [AX_CXX_COMPILE_STDCXX([17], [$1], [$2])]) From 50708cc23e1fb9f034a698bd6ac9aad4f93305b1 Mon Sep 17 00:00:00 2001 From: Andrew D Smith Date: Tue, 18 Nov 2025 14:36:20 -0800 Subject: [PATCH 2/2] .github/workflows/dnmtools_build_macos.yml: updating the macos build workflow because it won't run anymore for x86 --- .github/workflows/dnmtools_build_macos.yml | 37 +++++++++++----------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/.github/workflows/dnmtools_build_macos.yml b/.github/workflows/dnmtools_build_macos.yml index 2adda8fc..b4acb0e3 100644 --- a/.github/workflows/dnmtools_build_macos.yml +++ b/.github/workflows/dnmtools_build_macos.yml @@ -8,24 +8,25 @@ on: branches: [ "master" ] jobs: - build-with-gcc-on-x86: - runs-on: macos-13 - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - - name: Update Homebrew - run: brew update - - name: Install autotools - run: brew install automake - - name: Install dependencies - run: brew install htslib gsl - - name: Generate configure script - run: ./autogen.sh - - name: configure with g++-14 - run: ./configure CXX="g++-14" CPPFLAGS="-I$(brew --prefix)/include" LDFLAGS="-L$(brew --prefix)/lib" - - name: make - run: make -j4 + ## ADS: removing this because of 'brownout' on github runners + # build-with-gcc-on-x86: + # runs-on: macos-13 + # steps: + # - uses: actions/checkout@v4 + # with: + # submodules: recursive + # - name: Update Homebrew + # run: brew update + # - name: Install autotools + # run: brew install automake + # - name: Install dependencies + # run: brew install htslib gsl + # - name: Generate configure script + # run: ./autogen.sh + # - name: configure with g++-14 + # run: ./configure CXX="g++-14" CPPFLAGS="-I$(brew --prefix)/include" LDFLAGS="-L$(brew --prefix)/lib" + # - name: make + # run: make -j4 build-with-gcc-on-arm64: runs-on: macos-15 steps: