Attachment 188211 Details for Bug 223240 – Fix 10.x and i386 builds

[patch] Fix 10.x and i386 builds

arangodb32.diff (text/plain), 5.60 KB, created by dev on 2017-11-23 11:09:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: dev

Created: 2017-11-23 11:09:00 UTC

Size: 5.60 KB

patch

obsolete

>Index: databases/arangodb32/Makefile
>===================================================================
>--- databases/arangodb32/Makefile	(revision 454679)
>+++ databases/arangodb32/Makefile	(working copy)
>@@ -4,25 +4,41 @@
> PORTNAME=	arangodb
> DISTVERSIONPREFIX=	v
> DISTVERSION=	3.2.8
>+PORTREVISION=	1
> CATEGORIES=	databases net
> PKGNAMESUFFIX=	32
> 
>-MAINTAINER=	galu@packetdam.com	
>+MAINTAINER=	galu@packetdam.com
> COMMENT=	ArangoDB is a distributed NoSQL database with multiple data models
> 
> LICENSE=	APACHE20
> 
>-USES=		gmake ssl cmake:outsource,noninja python:2.7
>+USES=		gmake ssl cmake:outsource,noninja python:2.7 compiler
> USE_GITHUB=	yes
> 
> CMAKE_ARGS=	-DUSE_JEMALLOC:BOOL=off \
>-		-DUSE_BACKTRACE:BOOL=on \
>-		-DBASE_LD_FLAGS:STRING="-L${BUILD_WRKSRC}/3rdParty/V8/v5.7.492.77/x64.release/obj.target/src -L${BUILD_WRKSRC}/3rdParty/V8/v5.7.492.77/x64.release/obj.target/third_party/icu -L${LOCALBASE}/lib -L/usr/lib"
>+		-DUSE_BACKTRACE:BOOL=on
> 
> USERS=		arangodb
> GROUPS=		arangodb
> USE_RC_SUBR=	arangod
> 
>+.include <bsd.port.pre.mk>
>+
>+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 40
>+BUILD_DEPENDS+=	${LOCALBASE}/bin/clang40:devel/llvm40
>+CPP=    ${LOCALBASE}/bin/clang-cpp40
>+CC= ${LOCALBASE}/bin/clang40
>+CXX=    ${LOCALBASE}/bin/clang++40
>+.endif
>+
>+.if ${ARCH} == amd64
>+GYPTGT=	x64.release
>+.elif ${ARCH} == i386
>+GYPTGT=	ia32.release
>+.endif
>+CMAKE_ARGS+=	-DBASE_LD_FLAGS:STRING="-L${BUILD_WRKSRC}/3rdParty/V8/v5.7.492.77/${GYPTGT}/obj.target/src -L${BUILD_WRKSRC}/3rdParty/V8/v5.7.492.77/${GYPTGT}/obj.target/third_party/icu -L${LOCALBASE}/lib -L/usr/lib"
>+
> post-install:
> .for section in 1 8
> 	${MV} ${STAGEDIR}${PREFIX}/share/man/man${section}/* ${STAGEDIR}${PREFIX}/man/man${section}/
>@@ -38,4 +54,5 @@
> 	${RMDIR} ${STAGEDIR}${PREFIX}/var/log/arangodb
> 	${RMDIR} ${STAGEDIR}${PREFIX}/var/log
> 	${RMDIR} ${STAGEDIR}${PREFIX}/var
>-.include <bsd.port.mk>
>+
>+.include <bsd.port.post.mk>
>Index: databases/arangodb32/files/patch-CMakeLists.txt
>===================================================================
>--- databases/arangodb32/files/patch-CMakeLists.txt	(revision 454679)
>+++ databases/arangodb32/files/patch-CMakeLists.txt	(working copy)
>@@ -1,4 +1,4 @@
>---- CMakeLists.txt.orig	2017-11-15 11:23:07 UTC
>+--- CMakeLists.txt.orig	2017-11-18 11:03:51 UTC
> +++ CMakeLists.txt
> @@ -38,9 +38,9 @@ if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
>  endif ()
>Index: databases/arangodb32/files/patch-arangod_Agency_Store.cpp
>===================================================================
>--- databases/arangodb32/files/patch-arangod_Agency_Store.cpp	(revision 454679)
>+++ databases/arangodb32/files/patch-arangod_Agency_Store.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- arangod/Agency/Store.cpp.orig	2017-11-15 11:23:07 UTC
>+--- arangod/Agency/Store.cpp.orig	2017-11-18 11:03:51 UTC
> +++ arangod/Agency/Store.cpp
> @@ -601,7 +601,7 @@ void Store::dumpToBuilder(Builder& build
>        auto ts = std::chrono::duration_cast<std::chrono::seconds>(
>Index: databases/arangodb32/files/patch-arangod_RestHandler_RestAuthHandler.cpp
>===================================================================
>--- databases/arangodb32/files/patch-arangod_RestHandler_RestAuthHandler.cpp	(revision 454679)
>+++ databases/arangodb32/files/patch-arangod_RestHandler_RestAuthHandler.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- arangod/RestHandler/RestAuthHandler.cpp.orig	2017-11-15 11:23:07 UTC
>+--- arangod/RestHandler/RestAuthHandler.cpp.orig	2017-11-18 11:03:51 UTC
> +++ arangod/RestHandler/RestAuthHandler.cpp
> @@ -59,7 +59,7 @@ std::string RestAuthHandler::generateJwt
>      VPackObjectBuilder p(&bodyBuilder);
>Index: databases/arangodb32/files/patch-cmake_ArangoDBInstall.cmake
>===================================================================
>--- databases/arangodb32/files/patch-cmake_ArangoDBInstall.cmake	(revision 454679)
>+++ databases/arangodb32/files/patch-cmake_ArangoDBInstall.cmake	(working copy)
>@@ -1,4 +1,4 @@
>---- cmake/ArangoDBInstall.cmake.orig	2017-11-16 20:17:40 UTC
>+--- cmake/ArangoDBInstall.cmake.orig	2017-11-18 11:03:51 UTC
> +++ cmake/ArangoDBInstall.cmake
> @@ -100,7 +100,7 @@ endif ()
>  
>Index: databases/arangodb32/files/patch-lib_Basics_process-utils.cpp
>===================================================================
>--- databases/arangodb32/files/patch-lib_Basics_process-utils.cpp	(revision 454679)
>+++ databases/arangodb32/files/patch-lib_Basics_process-utils.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- lib/Basics/process-utils.cpp.orig	2017-11-15 11:23:07 UTC
>+--- lib/Basics/process-utils.cpp.orig	2017-11-18 11:03:51 UTC
> +++ lib/Basics/process-utils.cpp
> @@ -23,7 +23,7 @@
>  
>Index: databases/arangodb32/files/patch-lib_Basics_socket-utils.h
>===================================================================
>--- databases/arangodb32/files/patch-lib_Basics_socket-utils.h	(revision 454679)
>+++ databases/arangodb32/files/patch-lib_Basics_socket-utils.h	(working copy)
>@@ -1,4 +1,4 @@
>---- lib/Basics/socket-utils.h.orig	2017-11-15 11:23:07 UTC
>+--- lib/Basics/socket-utils.h.orig	2017-11-18 11:03:51 UTC
> +++ lib/Basics/socket-utils.h
> @@ -31,6 +31,12 @@
>  #include <WS2tcpip.h>
>Index: databases/arangodb32/files/patch-lib_Logger_LogAppenderSyslog.cpp
>===================================================================
>--- databases/arangodb32/files/patch-lib_Logger_LogAppenderSyslog.cpp	(revision 454679)
>+++ databases/arangodb32/files/patch-lib_Logger_LogAppenderSyslog.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- lib/Logger/LogAppenderSyslog.cpp.orig	2017-11-15 11:23:07 UTC
>+--- lib/Logger/LogAppenderSyslog.cpp.orig	2017-11-18 11:03:51 UTC
> +++ lib/Logger/LogAppenderSyslog.cpp
> @@ -64,7 +64,7 @@ LogAppenderSyslog::LogAppenderSyslog(std
>    if ('0' <= facility[0] && facility[0] <= '9') {

Actions: View | Diff

Attachments on bug 223240: 187467 | 187477 | 188159 | 188211