-
Notifications
You must be signed in to change notification settings - Fork 35.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
build: support OpenBSD in depends #23998
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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; | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's fine to require
gtar
—but I think if someone really wanted, they could work around this without any special tar options. I don't really understand--no-same-owner
here at all (it's only relevant when running this as root, and who builds as root?).--strip-components=1
will be harder to replace (but not impossible as the first component will be predictable based on the archive name IIRC).