Modifications to support non-Linux OSes (tested on FreeBSD 14) #32
Conversation
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
epoll and argp. Using epoll-shim and the standalone argp libraries. Tested on FreeBSD 14 -Including <netiniet/in.h> in src/datum_protocol.c. This is required for compilation on FreeBSD 14
luke-jr
requested changes
Oct 29, 2024
| @@ -41,6 +41,15 @@ pkg_check_modules(MICROHTTPD REQUIRED libmicrohttpd) | |||
| pkg_check_modules(SODIUM REQUIRED libsodium) | |||
| find_package(Threads REQUIRED) | |||
|
|
|||
| if(NOT LINUX) | |||
There was a problem hiding this comment.
This isn't a good way to do build conditionals. Need to check if epoll/argp work without extra libs, and check for extra libs if needed.
Noteworthy, some Linux distros do not have argp.
| @@ -95,3 +105,43 @@ target_compile_options(datum_gateway | |||
| ${JANSSON_CFLAGS} ${JANSSON_CFLAGS_OTHER} | |||
| ${SODIUM_CFLAGS} ${SODIUM_CFLAGS_OTHER} | |||
| ) | |||
|
|
|||
| else() | |||
There was a problem hiding this comment.
Please don't duplicate the whole thing. Just set the new vars to empty if not needed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
-Modifying CMakeLists.txt to support non-Linux OSes that do not include epoll and argp. Using epoll-shim and the standalone argp libraries. Tested on FreeBSD 14
-Including <netiniet/in.h> in src/datum_protocol.c. This is required for compilation on FreeBSD 14