Merge pull request #84 from DeckerSU/patch-update-config-guess

build: use latest config.{guess,sub} in depends
DeckerSU · Nov 6, 2024 · b5ad15e · b5ad15e
2 parents 7d05add + f487b7d
commit b5ad15e
Show file tree

Hide file tree

Showing 10 changed files with 2,432 additions and 1,990 deletions.
diff --git a/.github/actions/build-project-docker/entrypoint.sh b/.github/actions/build-project-docker/entrypoint.sh
@@ -179,6 +179,8 @@ if true; then
         if [[ "${delete_linux_depends}" = true ]]; then
             rm -rf ${WORKSPACE}/depends/built/x86_64-unknown-linux-gnu
             rm -rf ${WORKSPACE}/depends/x86_64-unknown-linux-gnu
+            rm -rf ${WORKSPACE}/depends/built/x86_64-pc-linux-gnu
+            rm -rf ${WORKSPACE}/depends/x86_64-pc-linux-gnu
         fi
         # delete possible artefacts from previous build(s)
         delete_artefacts focal

diff --git a/Dockerfile.focal.ci b/Dockerfile.focal.ci
@@ -6,7 +6,7 @@ FROM ubuntu:20.04
 # Run interactive session in build environment:
 # docker run -u $(id -u ${USER}):$(id -g ${USER}) -v $PWD:$PWD -w $PWD -e HOME=/root -it ocean_focal_builder
 # Run build itself:
-# delete ./built/x86_64-unknown-linux-gnu before build (!) other version of linux, then do:
+# delete ./built/x86_64-unknown-linux-gnu and/or x86_64-pc-linux-gnu before build (!) other version of linux, then do:
 # ./zcutil/clean-help-dev.sh ; make clean ; zcutil/build.sh -j$(nproc --all)
 # 
 # docker run -u $(id -u ${USER}):$(id -g ${USER}) -v $PWD:$PWD -w $PWD -e HOME=/root ocean_focal_builder /bin/bash -c "./zcutil/clean-help-dev.sh ; make clean ; zcutil/build.sh -j$(nproc --all)"

diff --git a/Dockerfile.xenial.ci b/Dockerfile.xenial.ci
@@ -6,7 +6,7 @@ FROM ubuntu:16.04
 # Run interactive session in build environment:
 # docker run -u $(id -u ${USER}):$(id -g ${USER}) -v $PWD:$PWD -w $PWD -e HOME=/root -it ocean_xenial_builder
 # Run build itself:
-# delete ./built/x86_64-unknown-linux-gnu before build (!) other version of linux, then do:
+# delete ./built/x86_64-unknown-linux-gnu and/or x86_64-pc-linux-gnu before build (!) other version of linux, then do:
 # ./zcutil/clean-help-dev.sh ; make clean ; zcutil/build.sh -j$(nproc --all)
 # 
 # docker run -u $(id -u ${USER}):$(id -g ${USER}) -v $PWD:$PWD -w $PWD -e HOME=/root ocean_xenial_builder /bin/bash -c "./zcutil/clean-help-dev.sh ; make clean ; zcutil/build.sh -j$(nproc --all)"

diff --git a/Makefile.am b/Makefile.am
@@ -218,10 +218,10 @@ baseline_filtered.info: baseline.info
 else
 baseline_filtered.info: baseline.info
 	$(LCOV) -r $< "/usr/include/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
+                      "$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/*.h" \
+                      "$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/boost/*" \
+                      "$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gmock/*" \
+                      "$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gtest/*" \
                       "$(abs_builddir)/src/gtest/*" \
                       "$(abs_builddir)/src/test/*" \
                       "$(abs_builddir)/src/wallet/gtest/*" \
@@ -247,10 +247,10 @@ leveldb_baseline_filtered.info: leveldb_baseline.info
 else
 leveldb_baseline_filtered.info: leveldb_baseline.info
 	$(LCOV) -r $< "/usr/include/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
+                      "$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/*.h" \
+                      "$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/boost/*" \
+                      "$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gmock/*" \
+                      "$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gtest/*" \
                       "$(abs_builddir)/src/gtest/*" \
                       "$(abs_builddir)/src/test/*" \
                       "$(abs_builddir)/src/wallet/gtest/*" \
@@ -282,10 +282,10 @@ test_komodo_filtered.info: test_komodo.info
 else
 test_komodo_filtered.info: test_komodo.info
 	$(LCOV) -r $< "/usr/include/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
+                      "$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/*.h" \
+                      "$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/boost/*" \
+                      "$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gmock/*" \
+                      "$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gtest/*" \
                       "$(abs_builddir)/src/gtest/*" \
                       "$(abs_builddir)/src/test/*" \
                       "$(abs_builddir)/src/wallet/gtest/*" \
@@ -315,10 +315,10 @@ block_test_filtered.info: block_test.info
 else
 block_test_filtered.info: block_test.info
 	$(LCOV) -r $< "/usr/include/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
-                      "$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
+                      "$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/*.h" \
+                      "$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/boost/*" \
+                      "$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gmock/*" \
+                      "$(abs_builddir)/depends/x86_64-pc-linux-gnu/include/gtest/*" \
                       "$(abs_builddir)/src/gtest/*" \
                       "$(abs_builddir)/src/test/*" \
                       "$(abs_builddir)/src/wallet/gtest/*" \

diff --git a/build_releases.sh b/build_releases.sh
@@ -174,6 +174,8 @@ if [[ "${build_xenial}" = "true" ]]; then
     if [[ "${delete_linux_depends}" = true ]]; then
         rm -rf ${WORKSPACE}/depends/built/x86_64-unknown-linux-gnu
         rm -rf ${WORKSPACE}/depends/x86_64-unknown-linux-gnu
+        rm -rf ${WORKSPACE}/depends/built/x86_64-pc-linux-gnu
+        rm -rf ${WORKSPACE}/depends/x86_64-pc-linux-gnu
     fi
     # delete possible artefacts from previous build(s)
     delete_artefacts xenial
@@ -191,6 +193,8 @@ if [[ "${build_focal}" = "true" ]]; then
     if [[ "${delete_linux_depends}" = true ]]; then
         rm -rf ${WORKSPACE}/depends/built/x86_64-unknown-linux-gnu
         rm -rf ${WORKSPACE}/depends/x86_64-unknown-linux-gnu
+        rm -rf ${WORKSPACE}/depends/built/x86_64-pc-linux-gnu
+        rm -rf ${WORKSPACE}/depends/x86_64-pc-linux-gnu
     fi
     # delete possible artefacts from previous build(s)
     delete_artefacts focal

diff --git a/depends/Makefile b/depends/Makefile
@@ -158,7 +158,7 @@ install: check-packages $(host_prefix)/share/config.site
 download-one: check-sources $(all_sources)
 
 download-osx:
-	@$(MAKE) -s HOST=x86_64-apple-darwin19 download-one
+	@$(MAKE) -s HOST=x86_64-apple-darwin download-one
 download-linux:
 	@$(MAKE) -s HOST=x86_64-unknown-linux-gnu download-one
 download-win: