let it build with clang

This commit is contained in:
espie 2017-05-22 14:00:21 +00:00
parent 8b76ed4760
commit b2238ce101
3 changed files with 22 additions and 10 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.24 2017/04/06 22:11:23 sthen Exp $
# $OpenBSD: Makefile,v 1.25 2017/05/22 14:00:21 espie Exp $
PORTROACH = limitw:1,even
USE_WXNEEDED = Yes
@ -22,19 +22,17 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += boost_chrono-mt boost_filesystem-mt boost_program_options-mt
WANTLIB += boost_regex-mt boost_system-mt boost_thread-mt c crypto
WANTLIB += execinfo kvm m pcap pcre pcrecpp pthread ssl yaml-cpp
WANTLIB += z
WANTLIB += z ${LIBECXX}
MASTER_SITES = https://fastdl.mongodb.org/src/
MODULES = gcc4 \
devel/scons \
MODULES = devel/scons \
lang/python
# XXX should come from scons module, but broken when gcc module also used:
NO_CCACHE = Yes
MODGCC4_ARCHS = *
MODGCC4_LANGS = c c++
WANT_CXX = base gcc
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
MODSCONS_ENV = CC="${CC}" \
CXX="${CXX}" \

View File

@ -1,7 +1,8 @@
$OpenBSD: patch-SConstruct,v 1.6 2016/05/06 15:33:37 sthen Exp $
--- SConstruct.orig Sat Apr 30 18:18:21 2016
+++ SConstruct Sat Apr 30 18:20:28 2016
@@ -831,6 +831,7 @@ envDict = dict(BUILD_ROOT=buildDir,
$OpenBSD: patch-SConstruct,v 1.7 2017/05/22 14:00:21 espie Exp $
Index: SConstruct
--- SConstruct.orig
+++ SConstruct
@@ -839,6 +839,7 @@ envDict = dict(BUILD_ROOT=buildDir,
INSTALL_DIR=installDir,
CONFIG_HEADER_DEFINES={},
LIBDEPS_TAG_EXPANSIONS=[],

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-src_mongo_platform_stack_locator_openbsd_cpp,v 1.1 2017/05/22 14:00:21 espie Exp $
Index: src/mongo/platform/stack_locator_openbsd.cpp
--- src/mongo/platform/stack_locator_openbsd.cpp.orig
+++ src/mongo/platform/stack_locator_openbsd.cpp
@@ -30,6 +30,7 @@
#include "mongo/platform/stack_locator.h"
+#include <pthread.h>
#include <pthread_np.h>
#include <sys/signal.h>