-
Notifications
You must be signed in to change notification settings - Fork 35.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge #23998: build: support OpenBSD in depends
471d155 build: add support for OpenBSD to depends (fanquake) 75ae39e build: add a default build tar in depends (fanquake) Pull request description: Completes the BSD trifecta. No Qt. Includes a commit that adds a default build_TAR to depends, to make it easier to override and use gnu/gtar, as OpenBSDs tar does not support some of the options we use. Also includes this patch, boostorg/test@684f067, to fix a compilation issue in Boost test. Have tested on OpenBSD 7.0 with: ```bash gmake -C depends -j9 ./autogen.sh CONFIG_SITE=/home/vagrant/bitcoin/depends/amd64-unknown-openbsd7.0/share/config.site ./configure --disable-external-signer MAKE=gmake gmake check -j9 ``` ACKs for top commit: laanwj: Tested ACK 471d155 theStack: Tested ACK 471d155 Tree-SHA512: 7009b5d4c84355ebe4ece7042e0ce131659b97eace611fb77f1f16901aafb4b28118961a608a245289772ef7c4acb606dc18357a82c91cdceaf6466fc1cfd242
- Loading branch information
Showing
13 changed files
with
98 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
build_openbsd_CC = clang | ||
build_openbsd_CXX = clang++ | ||
|
||
build_openbsd_SHA256SUM = sha256 | ||
build_openbsd_DOWNLOAD = curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o | ||
|
||
build_openbsd_TAR = gtar |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
openbsd_CFLAGS=-pipe | ||
openbsd_CFLAGS_CXXFLAGS=$(openbsd_CFLAGS) | ||
|
||
openbsd_CFLAGS_release_CFLAGS=-O2 | ||
openbsd_CFLAGS_release_CXXFLAGS=$(openbsd_release_CFLAGS) | ||
|
||
openbsd_CFLAGS_debug_CFLAGS=-O1 | ||
openbsd_CFLAGS_debug_CXXFLAGS=$(openbsd_debug_CFLAGS) | ||
|
||
ifeq (86,$(findstring 86,$(build_arch))) | ||
i686_openbsd_CC=clang -m32 | ||
i686_openbsd_CXX=clang++ -m32 | ||
i686_openbsd_AR=ar | ||
i686_openbsd_RANLIB=ranlib | ||
i686_openbsd_NM=nm | ||
i686_openbsd_STRIP=strip | ||
|
||
x86_64_openbsd_CC=clang -m64 | ||
x86_64_openbsd_CXX=clang++ -m64 | ||
x86_64_openbsd_AR=ar | ||
x86_64_openbsd_RANLIB=ranlib | ||
x86_64_openbsd_NM=nm | ||
x86_64_openbsd_STRIP=strip | ||
else | ||
i686_openbsd_CC=$(default_host_CC) -m32 | ||
i686_openbsd_CXX=$(default_host_CXX) -m32 | ||
x86_64_openbsd_CC=$(default_host_CC) -m64 | ||
x86_64_openbsd_CXX=$(default_host_CXX) -m64 | ||
endif | ||
|
||
openbsd_cmake_system=OpenBSD |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
commit 684f067dde3b798877655cdda4eab8d7c26b2510 | ||
Author: George Koehler <kernigh@gmail.com> | ||
Date: Thu Oct 3 20:06:38 2019 -0400 | ||
|
||
OpenBSD is missing SI_ASYNCIO and SI_MESGQ | ||
|
||
Check if SI_ASYNCIO and SI_MESGQ are defined as macros. This allows | ||
to run tests on OpenBSD 6.5, where the macros are missing. | ||
|
||
This is identical to patch-boost_test_impl_execution_monitor_ipp in | ||
OpenBSD Ports, except that I added a comment. | ||
|
||
Can be removed when we use Boost 1.72.x or later. | ||
|
||
diff --git a/boost/test/impl/execution_monitor.ipp b/boost/test/impl/execution_monitor.ipp | ||
index ccc44972..77a01e21 100644 | ||
--- a/boost/test/impl/execution_monitor.ipp | ||
+++ b/boost/test/impl/execution_monitor.ipp | ||
@@ -391,14 +391,19 @@ system_signal_exception::report() const | ||
report_error( execution_exception::system_error, | ||
"signal: the expiration of a timer set by timer_settimer()" ); | ||
break; | ||
+// OpenBSD was missing SI_ASYNCIO and SI_MESGQ | ||
+#ifdef SI_ASYNCIO | ||
case SI_ASYNCIO: | ||
report_error( execution_exception::system_error, | ||
"signal: generated by the completion of an asynchronous I/O request" ); | ||
break; | ||
+#endif | ||
+#ifdef SI_MESGQ | ||
case SI_MESGQ: | ||
report_error( execution_exception::system_error, | ||
"signal: generated by the the arrival of a message on an empty message queue" ); | ||
break; | ||
+#endif | ||
default: | ||
break; | ||
} |