fix ci

sp1ff · Jan 14, 2024 · 1238c1f · 1238c1f
1 parent 50d6097
commit 1238c1f
Showing 1 changed file with 2 additions and 71 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -157,42 +157,6 @@ jobs:
         tar xf boost_${{ matrix.boost-ver }}.tar.bz2
         mkdir boost_${{ matrix.boost-ver }}/installdir
 
-    # - name: Patch boost source (MacOS)
-    #   if: matrix.os == 'macos-12' && steps.cache-boost-macos.outputs.cache-hit != 'true' && matrix.boost == 'oldest'
-    #   run: |
-    #     cd boost_${{ matrix.boost-ver }}/tools/build/src/engine
-    #     cp build.sh build.sh.bak
-    #     awk '/darwin\)/{print; print "    BOOST_JAM_OPT_JAM=\"$BOOST_JAM_OPT_JAM $CFLAGS $LIBS\""; next }1' build.sh > build.sh.tmp
-    #     mv build.sh.tmp build.sh
-    #     chmod a+x build.sh
-    #     # cat build.sh
-    #     # cp execcmd.c execcmd.c.bak
-    #     # awk '/#include "execcmd.h"/{print; print "#include \"output.h\""; next }1' execcmd.c > execcmd.c.tmp
-    #     # mv execcmd.c.tmp execcmd.c
-    #     # cat execcmd.c
-    #     cp make.c make.c.bak
-    #     awk '/#include "make.h"/{print; print "#include \"output.h\""; next }1' make.c > make.c.tmp
-    #     mv make.c.tmp make.c
-    #     # cat make.c
-    #     cp filesys.c filesys.c.bak
-    #     awk '/#include "filesys.h"/{print; print "int filelist_empty( FILELIST * list );"; next }1' filesys.c > filesys.c.tmp
-    #     mv filesys.c.tmp filesys.c
-    #     # cat filesys.c
-    #     cp modules/path.c modules/path.c.bak
-    #     awk '/#include "..\/timestamp.h"/{print; print "#include \"../filesys.h\""; next }1' modules/path.c > modules/path.c.tmp
-    #     mv modules/path.c.tmp modules/path.c
-    #     # cat modules/path.c
-    #     cp fileunix.c fileunix.c.bak
-    #     awk '/#include "jam.h"/{print; print "int filelist_empty( FILELIST * list );"; next }1' fileunix.c > fileunix.c.tmp
-    #     awk '/#include "jam.h"/{print; print "#include \"filesys.h\""; next }1' fileunix.c.tmp > fileunix.c.tmp.1
-    #     awk '/#include "filesys.h"/{print; print "int file_collect_archive_content_( file_archive_info_t * const archive );"; next }1' fileunix.c.tmp.1 > fileunix.c
-    #     # cat fileunix.c
-    #     cd ../tools
-    #     cp darwin.jam darwin.jam.bak
-    #     head -n138 darwin.jam > darwin.jam.tmp
-    #     tail -n +145 darwin.jam >> darwin.jam.tmp
-    #     mv darwin.jam.tmp darwin.jam
-
     - name: Build boost (MacOS)
       if: matrix.os == 'macos-12' && steps.cache-boost-macos.outputs.cache-hit != 'true'
       shell: bash
@@ -208,8 +172,8 @@ jobs:
         ./b2
         ./b2 install
 
-    - name: Patch boost library dependencies (MacOS, non-oldest)
-      if: matrix.os == 'macos-12' # && matrix.boost != 'oldest' # && steps.cache-boost-macos.outputs.cache-hit != 'true'
+    - name: Patch boost library dependencies (MacOS)
+      if: matrix.os == 'macos-12' # && steps.cache-boost-macos.outputs.cache-hit != 'true'
       run: |
         cd boost_${{ matrix.boost-ver }}/installdir/lib
         pwd
@@ -235,39 +199,6 @@ jobs:
         otool -L libboost_thread.dylib
         echo ================================================
 
-    # - name: Patch boost library dependencies (MacOS, oldest)
-    #   if: matrix.os == 'macos-12' && matrix.boost == 'oldest' # && steps.cache-boost-macos.outputs.cache-hit != 'true'
-    #   run: |
-    #     cd boost_${{ matrix.boost-ver }}/installdir/lib
-    #     pwd
-    #     ls
-    #     echo ================================================
-    #     otool -L libboost_log.dylib
-    #     otool -L libboost_chrono.dylib
-    #     otool -L libboost_thread.dylib
-    #     otool -L libboost_unit_test_framework.dylib
-    #     otool -L libboost_timer.dylib
-    #     echo ================================================
-    #     here=$(pwd)
-    #     install_name_tool -change libboost_atomic.dylib     ${here}/libboost_atomic.dylib     libboost_log.dylib
-    #     install_name_tool -change libboost_chrono.dylib     ${here}/libboost_chrono.dylib     libboost_log.dylib
-    #     install_name_tool -change libboost_filesystem.dylib ${here}/libboost_filesystem.dylib libboost_log.dylib
-    #     install_name_tool -change libboost_thread.dylib     ${here}/libboost_thread.dylib     libboost_log.dylib
-    #     install_name_tool -change libboost_date_time.dylib  ${here}/libboost_date_time.dylib  libboost_log.dylib
-    #     install_name_tool -change libboost_system.dylib     ${here}/libboost_system.dylib     libboost_log.dylib
-    #     install_name_tool -change libboost_regex.dylib      ${here}/libboost_regex.dylib      libboost_log.dylib
-    #     install_name_tool -change libboost_system.dylib     ${here}/libboost_system.dylib     libboost_chrono.dylib
-    #     install_name_tool -change libboost_system.dylib     ${here}/libboost_system.dylib     libboost_thread.dylib
-    #     install_name_tool -change libboost_timer.dylib      ${here}/libboost_timer.dylib      libboost_unit_test_framework.dylib
-    #     install_name_tool -change libboost_chrono.dylib     ${here}/libboost_chrono.dylib     libboost_timer.dylib
-    #     echo ================================================
-    #     otool -L libboost_log.dylib
-    #     otool -L libboost_chrono.dylib
-    #     otool -L libboost_thread.dylib
-    #     otool -L libboost_unit_test_framework.dylib
-    #     otool -L libboost_timer.dylib
-    #     echo ================================================
-
     - name: Configure scribbu (Ubuntu, non-latest)
       if: matrix.os == 'ubuntu-22.04' && matrix.boost != 'latest'
       shell: bash