Fix OpenBSD compilation issues (Chia-Network#115)

* Include stdlib.h for alloca() * Prepend relic contrib include paths, rather than append * Avoids conflict with "relic.h" implemented by "Relic - the NDBM-compatible API of QDBM", which is used by mutt
sarvex · Jun 10, 2020 · 5a7c703 · 5a7c703
1 parent 523738e
commit 5a7c703
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/contrib/relic/CMakeLists.txt b/contrib/relic/CMakeLists.txt
@@ -11,7 +11,7 @@ set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT
 set(VERSION ${PROJECT_VERSION})
 
 set(INCLUDE ${CMAKE_CURRENT_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include/low ${CMAKE_CURRENT_SOURCE_DIR}/src/tmpl)
-include_directories(${INCLUDE})
+include_directories(BEFORE ${INCLUDE})
 
 set(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

diff --git a/contrib/relic/include/relic_alloc.h b/contrib/relic/include/relic_alloc.h
@@ -52,7 +52,11 @@
 
 #else /* _MSC_VER */
 
+#if defined(__OpenBSD__)
+#include <stdlib.h>
+#else
 #include <alloca.h>
+#endif
 
 /*
  * Dynamiclly allocates an array of "Type" with the specified size on the stack.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -5,7 +5,7 @@ file(GLOB HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.hpp)
 source_group("SrcHeaders" FILES ${HEADERS})
 
 include_directories(
-  ${INCLUDE_DIRECTORIES}
+  BEFORE
   ${CMAKE_CURRENT_SOURCE_DIR}/../contrib/relic/include
   ${CMAKE_BINARY_DIR}/contrib/relic/include
   ${CMAKE_CURRENT_SOURCE_DIR}/../contrib/catch