Regenerate artifacts.Regenerate artifacts, bumps to clang15.

evoskuil · Jan 29, 2024 · 7f687bb · 7f687bb
1 parent b34e788
commit 7f687bb
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 46 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,28 +18,28 @@ jobs:
       matrix:
         include:
           - os: ubuntu-22.04
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "dynamic"
             optimization: "size"
             assert: "debug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
-            cc: "clang-14"
+            cc: "clang-15"
             flags: "-Os -fPIE"
             options: "--enable-isystem --enable-avx2 --enable-sse4"
             packager: "apt"
             packages: ""
 
           - os: ubuntu-22.04
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "static"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang-15"
             flags: "-Os -fPIE"
             options: "--enable-isystem --enable-avx2"
             packager: "apt"
@@ -74,28 +74,28 @@ jobs:
             packages: "lcov"
 
           - os: macos-latest
-            cxx: "clang++-14"
+            cxx: "clang++"
             link: "dynamic"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--with-icu"
-            cc: "clang-14"
+            cc: "clang"
             flags: "-Os -fPIE"
             options: "--enable-isystem"
             packager: "brew"
             packages: "icu4c"
 
           - os: macos-latest
-            cxx: "clang++-14"
+            cxx: "clang++"
             link: "static"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang"
             flags: "-Os -fvisibility=hidden -fPIE"
             options: "--enable-isystem"
             packager: "brew"
@@ -149,6 +149,12 @@ jobs:
             echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV
           fi
 
+      - name: Display Compiler details
+        shell: bash
+        run: |
+          ${CC} -v
+          ${CXX} -v
+
       - name: Display CPU details
         if: ${{ (runner.os == 'Linux') }}
         shell: bash
@@ -158,8 +164,8 @@ jobs:
       - name: Execute install.sh
         run: >
           ./install.sh
-          --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
-          --prefix=$LIBBITCOIN_SRC_PATH/prefix
+          --build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
+          --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix
           ${{ env.LINKAGE }}
           ${{ env.ASSERT_NDEBUG }}
           ${{ matrix.boost }}
@@ -235,28 +241,28 @@ jobs:
       matrix:
         include:
           - os: ubuntu-22.04
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "dynamic"
             optimization: "size"
             assert: "debug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
-            cc: "clang-14"
+            cc: "clang-15"
             flags: "-Os -fPIE"
             options: "-Denable-avx2=on -Denable-sse4=on"
             packager: "apt"
             packages: ""
 
           - os: ubuntu-22.04
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "static"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang-15"
             flags: "-Os -fPIE"
             options: "-Denable-avx2=on"
             packager: "apt"
@@ -291,28 +297,28 @@ jobs:
             packages: ""
 
           - os: macos-latest
-            cxx: "clang++-14"
+            cxx: "clang++"
             link: "dynamic"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--with-icu"
-            cc: "clang-14"
+            cc: "clang"
             flags: "-Os -fPIE"
             options: ""
             packager: "brew"
             packages: "icu4c"
 
           - os: macos-latest
-            cxx: "clang++-14"
+            cxx: "clang++"
             link: "static"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang"
             flags: "-Os -fvisibility=hidden -fPIE"
             options: ""
             packager: "brew"
@@ -369,6 +375,12 @@ jobs:
             echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV
           fi
 
+      - name: Display Compiler details
+        shell: bash
+        run: |
+          ${CC} -v
+          ${CXX} -v
+
       - name: Display CPU details
         if: ${{ (runner.os == 'Linux') }}
         shell: bash
@@ -378,8 +390,8 @@ jobs:
       - name: Execute install-cmake.sh
         run: >
           ./install-cmake.sh
-          --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
-          --prefix=$LIBBITCOIN_SRC_PATH/prefix
+          --build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
+          --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix
           ${{ env.LINKAGE }}
           ${{ env.ASSERT_NDEBUG }}
           ${{ matrix.boost }}
@@ -466,29 +478,29 @@ jobs:
         include:
           - os: ubuntu-22.04
             preset: "nix-gnu-debug-shared-without_icu"
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "dynamic"
             optimization: "size"
             assert: "debug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: ""
-            cc: "clang-14"
+            cc: "clang-15"
             flags: "-Os -fPIE"
             options: "-Denable-avx2=on -Denable-sse4=on"
             packager: "apt"
             packages: ""
 
           - os: ubuntu-22.04
             preset: "nix-gnu-release-static-size-with_icu"
-            cxx: "clang++-14"
+            cxx: "clang++-15"
             link: "static"
             optimization: "size"
             assert: "ndebug"
             coverage: "nocov"
             boost: "--build-boost"
             icu: "--build-icu --with-icu"
-            cc: "clang-14"
+            cc: "clang-15"
             flags: "-Os -fPIE"
             options: "-Denable-avx2=on"
             packager: "apt"
@@ -560,6 +572,12 @@ jobs:
             echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/${{ matrix.preset }}/lib" >> $GITHUB_ENV
           fi
 
+      - name: Display Compiler details
+        shell: bash
+        run: |
+          ${CC} -v
+          ${CXX} -v
+
       - name: Display CPU details
         if: ${{ (runner.os == 'Linux') }}
         shell: bash
@@ -569,8 +587,8 @@ jobs:
       - name: Execute install-cmakepresets.sh
         run: >
           ./install-cmakepresets.sh
-          --build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
-          --prefix=$LIBBITCOIN_SRC_PATH/prefix/${{ matrix.preset }}
+          --build-dir=${{ env.LIBBITCOIN_SRC_PATH }} ${{ matrix.options }}
+          --prefix=${{ env.LIBBITCOIN_SRC_PATH }}prefix/${{ matrix.preset }}
           --preset=${{ matrix.preset }}
           ${{ env.LINKAGE }}
           ${{ env.ASSERT_NDEBUG }}

diff --git a/install-cmake.sh b/install-cmake.sh
@@ -442,15 +442,9 @@ set_pkgconfigdir()
 set_with_boost_prefix()
 {
     if [[ $BUILD_BOOST ]]; then
-        # Boost has no pkg-config, m4 searches in the following order:
-        # --with-boost=<path>, /usr, /usr/local, /opt, /opt/local, $BOOST_ROOT.
-        # We use --with-boost to prioritize the --prefix path when we build it.
-        # Otherwise standard paths suffice for Linux, Homebrew and MacPorts.
-        # ax_boost_base.m4 appends /include and adds to BOOST_CPPFLAGS
-        # ax_boost_base.m4 searches for /lib /lib64 and adds to BOOST_LDFLAGS
-        #
-        # cmake does not process this argument, so it has been zeroed out.
-        with_boost=""
+        # Boost detection via FindBoost.cmake provides for path hint via
+	# $BOOT_ROOT environment variable only.
+        export BOOST_ROOT="$PREFIX"
     fi
 }
 
@@ -470,6 +464,7 @@ display_configuration()
     display_message "WITH_ICU              : $WITH_ICU"
     display_message "BUILD_ICU             : $BUILD_ICU"
     display_message "BUILD_BOOST           : $BUILD_BOOST"
+    display_message "BOOST_ROOT            : $BOOST_ROOT"
     display_message "BUILD_DIR                      : $BUILD_DIR"
     display_message "CUMULATIVE_FILTERED_ARGS       : $CUMULATIVE_FILTERED_ARGS"
     display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE"
@@ -714,7 +709,7 @@ cmake_project_directory()
     local PROJ_CONFIG_DIR
     PROJ_CONFIG_DIR=$(pwd)
 
-    cmake $@ builds/cmake
+    cmake -LA $@ builds/cmake
     make_jobs "$JOBS"
 
     if [[ $TEST == true ]]; then

diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh
@@ -503,15 +503,9 @@ set_pkgconfigdir()
 set_with_boost_prefix()
 {
     if [[ $BUILD_BOOST ]]; then
-        # Boost has no pkg-config, m4 searches in the following order:
-        # --with-boost=<path>, /usr, /usr/local, /opt, /opt/local, $BOOST_ROOT.
-        # We use --with-boost to prioritize the --prefix path when we build it.
-        # Otherwise standard paths suffice for Linux, Homebrew and MacPorts.
-        # ax_boost_base.m4 appends /include and adds to BOOST_CPPFLAGS
-        # ax_boost_base.m4 searches for /lib /lib64 and adds to BOOST_LDFLAGS
-        #
-        # cmake does not process this argument, so it has been zeroed out.
-        with_boost=""
+        # Boost detection via FindBoost.cmake provides for path hint via
+	# $BOOT_ROOT environment variable only.
+        export BOOST_ROOT="$PREFIX"
     fi
 }
 
@@ -531,6 +525,7 @@ display_configuration()
     display_message "WITH_ICU              : $WITH_ICU"
     display_message "BUILD_ICU             : $BUILD_ICU"
     display_message "BUILD_BOOST           : $BUILD_BOOST"
+    display_message "BOOST_ROOT            : $BOOST_ROOT"
     display_message "BUILD_DIR                      : $BUILD_DIR"
     display_message "PRESET_ID                      : $PRESET_ID"
     display_message "CUMULATIVE_FILTERED_ARGS       : $CUMULATIVE_FILTERED_ARGS"
@@ -779,7 +774,7 @@ cmake_project_directory()
 
     push_directory "builds/cmake"
     display_message "Preparing cmake --preset=$PRESET $@"
-    cmake --preset=$PRESET $@
+    cmake -LA --preset=$PRESET $@
     popd
 
     push_directory "obj/$PRESET"

diff --git a/install.sh b/install.sh
@@ -389,6 +389,7 @@ set_with_boost_prefix()
         # ax_boost_base.m4 appends /include and adds to BOOST_CPPFLAGS
         # ax_boost_base.m4 searches for /lib /lib64 and adds to BOOST_LDFLAGS
         with_boost="--with-boost=$PREFIX"
+        export BOOST_ROOT="$PREFIX"
     fi
 }
 
@@ -408,6 +409,7 @@ display_configuration()
     display_message "WITH_ICU              : $WITH_ICU"
     display_message "BUILD_ICU             : $BUILD_ICU"
     display_message "BUILD_BOOST           : $BUILD_BOOST"
+    display_message "BOOST_ROOT            : $BOOST_ROOT"
     display_message "BUILD_DIR             : $BUILD_DIR"
     display_message "PREFIX                : $PREFIX"
     display_message "DISABLE_SHARED        : $DISABLE_SHARED"