Attachment #192653 for bug #225698

View | Details | Raw Unified | Return to bug 225698
Collapse All | Expand All




# Created by: Vlad Galu <dev@dudu.ro>
# $FreeBSD$

PORTNAME=	arangodb
DISTVERSIONPREFIX=	v
DISTVERSION=	3.2.13
CATEGORIES=	databases net
PKGNAMESUFFIX=	32

MAINTAINER=	dev@dudu.ro
COMMENT=	ArangoDB is a distributed NoSQL database with multiple data models

LICENSE=	APACHE20

Lines 1-3 Link Here

(-)databases/arangodb32/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1517870228	1	TIMESTAMP = 1524145771
2	SHA256 (arangodb-arangodb-v3.2.10_GH0.tar.gz) = e8b2f8b66805a07ddf959362d6b2c2bb4df7056c213abe0c45080846b30e7a89	2	SHA256 (arangodb-arangodb-v3.2.13_GH0.tar.gz) = 83784358c91f7163a47ec509ac4e527dc659182cfa8678b044da1b50c3e381fd
3	SIZE (arangodb-arangodb-v3.2.10_GH0.tar.gz) = 144581079	3	SIZE (arangodb-arangodb-v3.2.13_GH0.tar.gz) = 144636599




--- CMakeLists.txt.orig	2018-04-11 15:16:11 UTC
+++ CMakeLists.txt
@@ -38,9 +38,9 @@ if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
 endif ()

 endif ()
 
 # required for clang completion in editors
@@ -377,7 +377,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR APPLE)
 endif ()
 
 if (CMAKE_COMPILER_IS_CLANG)

     set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -stdlib=libc++")
     add_definitions("-Wno-deprecated-declarations")
   else ()
@@ -483,7 +483,7 @@ else ()
   if (MSVC)
     set(BT_LIBS "Dbghelp" CACHE path "Debug Helper libraries")
   else ()
-    set(BT_LIBS "" CACHE path "Debug Helper libraries")
+    if (FREEBSD)
+      set(BT_LIBS execinfo)
+    else ()
+      set(BT_LIBS "" CACHE path "Debug Helper libraries")
+    endif ()
   endif ()
 
   include(VcMacros)
 
-  option(USE_OPTIMIZE_FOR_ARCHITECTURE "try to determine CPU architecture" ON)
+  option(USE_OPTIMIZE_FOR_ARCHITECTURE "try to determine CPU architecture" OFF)
 
   if (USE_OPTIMIZE_FOR_ARCHITECTURE)
     # mop: core2 (merom) is our absolute minimum!
@@ -594,9 +594,7 @@ endif ()
 ################################################################################
 
 if (NOT WINDOWS)
-  set(SYS_LIBS ${SYS_LIBS} resolv)
-
-  if (NOT DARWIN)
+  if (NOT DARWIN OR FREEBSD)
 
   if (NOT DARWIN)
     set(SYS_LIBS ${SYS_LIBS} rt)
   endif ()
 endif ()




--- arangod/RocksDBEngine/RocksDBThrottle.cpp.orig	2018-01-05 13:56:52 UTC
+++ arangod/RocksDBEngine/RocksDBThrottle.cpp
@@ -515,8 +515,8 @@ void RocksDBThrottle::AdjustThreadPriori
     pid_t tid;
     int ret_val;
 
-    tid = syscall(SYS_gettid);
-    if (-1!=(int)tid)
+    ret_val = syscall(SYS_thr_self, &tid);
+    if (-1!=ret_val)
     {
       errno=0;
       ret_val=getpriority(PRIO_PROCESS, tid);
@@ -534,8 +534,9 @@ void RocksDBThrottle::AdjustThreadPriori
       && (gThreadPriority._basePriority+Adjustment)!=gThreadPriority._currentPriority) {
 
     pid_t tid;
-    tid = syscall(SYS_gettid);
-    if (-1!=(int)tid)
+    int ret_val;
+    ret_val = syscall(SYS_thr_self, &tid);
+    if (-1!=(int)ret_val)
     {
       gThreadPriority._currentPriority = gThreadPriority._basePriority + Adjustment;
       setpriority(PRIO_PROCESS, tid, gThreadPriority._currentPriority);




--- lib/Basics/ArangoGlobalContext.cpp.orig	2018-04-12 13:04:01 UTC
+++ lib/Basics/ArangoGlobalContext.cpp
@@ -145,10 +145,9 @@ ArangoGlobalContext::ArangoGlobalContext
 #ifndef __GLIBC__
   // Increase default stack size for libmusl:
   pthread_attr_t a;
-  memset(&a, 0, sizeof(pthread_attr_t));
+  pthread_attr_init(&a);
   pthread_attr_setstacksize(&a, 8*1024*1024);  // 8MB as in glibc
   pthread_attr_setguardsize(&a, 4096);         // one page
-  pthread_setattr_default_np(&a);
 #endif
 #endif
 #endif

Lines 1-11 Link Here

(-)databases/arangodb32/files/patch-lib_Logger_LogAppenderSyslog.cpp (-4 / +4 lines)
1	--- lib/Logger/LogAppenderSyslog.cpp.orig 2017-11-15 11:23:07 UTC	1	--- lib/Logger/LogAppenderSyslog.cpp.orig 2018-04-12 15:37:36 UTC
2	+++ lib/Logger/LogAppenderSyslog.cpp	2	+++ lib/Logger/LogAppenderSyslog.cpp
3	@@ -64,7 +64,7 @@ LogAppenderSyslog::LogAppenderSyslog(std	3	@@ -62,7 +62,7 @@ LogAppenderSyslog::LogAppenderSyslog(std
4	if ('0' <= facility[0] && facility[0] <= '9') {	4	if ('0' <= facility[0] && facility[0] <= '9') {
5	value = StringUtils::int32(facility);	5	value = StringUtils::int32(facility);
6	} else {	6	} else {
7	- CODE* ptr = reinterpret_cast<CODE*>(TRI_facilitynames);	7	- CODE* ptr = reinterpret_cast<CODE*>(facilitynames);
8	+ const CODE* ptr = reinterpret_cast<const CODE*>(TRI_facilitynames);	8	+ const CODE* ptr = reinterpret_cast<const CODE*>(facilitynames);
9		9
10	while (ptr->c_name != 0) {	10	while (ptr->c_name != 0) {
11	if (strcmp(ptr->c_name, facility.c_str()) == 0) {	11	if (strcmp(ptr->c_name, facility.c_str()) == 0) {

Return to bug 225698

Lines 1-13 Link Here

(-)databases/arangodb32/Makefile (-3 / +3 lines)
1	# Created by: Vlad Galu <galu@packetdam.com>	1	# Created by: Vlad Galu <dev@dudu.ro>
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= arangodb	4	PORTNAME= arangodb
5	DISTVERSIONPREFIX= v	5	DISTVERSIONPREFIX= v
6	DISTVERSION= 3.2.10	6	DISTVERSION= 3.2.13
7	CATEGORIES= databases net	7	CATEGORIES= databases net
8	PKGNAMESUFFIX= 32	8	PKGNAMESUFFIX= 32
9		9
10	MAINTAINER= galu@packetdam.com	10	MAINTAINER= dev@dudu.ro
11	COMMENT= ArangoDB is a distributed NoSQL database with multiple data models	11	COMMENT= ArangoDB is a distributed NoSQL database with multiple data models
12		12
13	LICENSE= APACHE20	13	LICENSE= APACHE20

Lines 1-4 Link Here

(-)databases/arangodb32/files/patch-CMakeLists.txt (-20 / +16 lines)
1	--- CMakeLists.txt.orig 2017-11-15 11:23:07 UTC	1	--- CMakeLists.txt.orig 2018-04-11 15:16:11 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -38,9 +38,9 @@ if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)	3	@@ -38,9 +38,9 @@ if (NOT CMAKE_OSX_DEPLOYMENT_TARGET)
4	endif ()	4	endif ()
Lines 12-18 Link Here
12	endif ()	12	endif ()
13		13
14	# required for clang completion in editors	14	# required for clang completion in editors
15	@@ -364,7 +364,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR APPLE)	15	@@ -377,7 +377,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR APPLE)
16	endif ()	16	endif ()
17		17
18	if (CMAKE_COMPILER_IS_CLANG)	18	if (CMAKE_COMPILER_IS_CLANG)
Lines 21-47 Link Here
21	set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -stdlib=libc++")	21	set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -stdlib=libc++")
22	add_definitions("-Wno-deprecated-declarations")	22	add_definitions("-Wno-deprecated-declarations")
23	else ()	23	else ()
24	@@ -498,7 +498,11 @@ if (USE_BACKTRACE)	24	@@ -483,7 +483,7 @@ else ()
25	if (MSVC)
26	set(BT_LIBS "Dbghelp" CACHE path "Debug Helper libraries")
27	else ()
28	- set(BT_LIBS "" CACHE path "Debug Helper libraries")
29	+ if (FREEBSD)
30	+ set(BT_LIBS execinfo)
31	+ else ()
32	+ set(BT_LIBS "" CACHE path "Debug Helper libraries")
33	+ endif ()
34	endif ()
35		25
36	add_definitions("-DARANGODB_ENABLE_BACKTRACE=1")	26	include(VcMacros)
37	@@ -573,7 +577,9 @@ endif ()	27
		28	- option(USE_OPTIMIZE_FOR_ARCHITECTURE "try to determine CPU architecture" ON)
		29	+ option(USE_OPTIMIZE_FOR_ARCHITECTURE "try to determine CPU architecture" OFF)
		30
		31	if (USE_OPTIMIZE_FOR_ARCHITECTURE)
		32	# mop: core2 (merom) is our absolute minimum!
		33	@@ -594,9 +594,7 @@ endif ()
38	################################################################################	34	################################################################################
39		35
40	if (NOT WINDOWS)	36	if (NOT WINDOWS)
41	- set(SYS_LIBS ${SYS_LIBS} resolv)	37	- set(SYS_LIBS ${SYS_LIBS} resolv)
42	+ if (NOT FREEBSD)	38	-
43	+ set(SYS_LIBS ${SYS_LIBS} resolv)	39	- if (NOT DARWIN)
44	+ endif ()	40	+ if (NOT DARWIN OR FREEBSD)
45
46	if (NOT DARWIN)
47	set(SYS_LIBS ${SYS_LIBS} rt)	41	set(SYS_LIBS ${SYS_LIBS} rt)
		42	endif ()
		43	endif ()

Line 0 Link Here

(-)databases/arangodb32/files/patch-arangod_RocksDBEngine_RocksDBThrottle.cpp (+25 lines)
	1	--- arangod/RocksDBEngine/RocksDBThrottle.cpp.orig 2018-01-05 13:56:52 UTC
	2	+++ arangod/RocksDBEngine/RocksDBThrottle.cpp
	3	@@ -515,8 +515,8 @@ void RocksDBThrottle::AdjustThreadPriori
	4	pid_t tid;
	5	int ret_val;
	6
	7	- tid = syscall(SYS_gettid);
	8	- if (-1!=(int)tid)
	9	+ ret_val = syscall(SYS_thr_self, &tid);
	10	+ if (-1!=ret_val)
	11	{
	12	errno=0;
	13	ret_val=getpriority(PRIO_PROCESS, tid);
	14	@@ -534,8 +534,9 @@ void RocksDBThrottle::AdjustThreadPriori
	15	&& (gThreadPriority._basePriority+Adjustment)!=gThreadPriority._currentPriority) {
	16
	17	pid_t tid;
	18	- tid = syscall(SYS_gettid);
	19	- if (-1!=(int)tid)
	20	+ int ret_val;
	21	+ ret_val = syscall(SYS_thr_self, &tid);
	22	+ if (-1!=(int)ret_val)
	23	{
	24	gThreadPriority._currentPriority = gThreadPriority._basePriority + Adjustment;
	25	setpriority(PRIO_PROCESS, tid, gThreadPriority._currentPriority);

Line 0 Link Here

(-)databases/arangodb32/files/patch-lib_Basics_ArangoGlobalContext.cpp (+14 lines)
	1	--- lib/Basics/ArangoGlobalContext.cpp.orig 2018-04-12 13:04:01 UTC
	2	+++ lib/Basics/ArangoGlobalContext.cpp
	3	@@ -145,10 +145,9 @@ ArangoGlobalContext::ArangoGlobalContext
	4	#ifndef __GLIBC__
	5	// Increase default stack size for libmusl:
	6	pthread_attr_t a;
	7	- memset(&a, 0, sizeof(pthread_attr_t));
	8	+ pthread_attr_init(&a);
	9	pthread_attr_setstacksize(&a, 810241024); // 8MB as in glibc
	10	pthread_attr_setguardsize(&a, 4096); // one page
	11	- pthread_setattr_default_np(&a);
	12	#endif
	13	#endif
	14	#endif

Lines 747-752 Link Here

(-)databases/arangodb32/pkg-plist (+5 lines)
747	%%DATADIR%%/js/node/node_modules/chai/lib/chai/config.js	747	%%DATADIR%%/js/node/node_modules/chai/lib/chai/config.js
748	%%DATADIR%%/js/node/node_modules/chai/lib/chai/core/assertions.js	748	%%DATADIR%%/js/node/node_modules/chai/lib/chai/core/assertions.js
749	%%DATADIR%%/js/node/node_modules/chai/lib/chai/interface/assert.js	749	%%DATADIR%%/js/node/node_modules/chai/lib/chai/interface/assert.js
		750	%%DATADIR%%/js/node/node_modules/chai/lib/chai/interface/expect.js
750	%%DATADIR%%/js/node/node_modules/chai/lib/chai/interface/should.js	751	%%DATADIR%%/js/node/node_modules/chai/lib/chai/interface/should.js
751	%%DATADIR%%/js/node/node_modules/chai/lib/chai/utils/addChainableMethod.js	752	%%DATADIR%%/js/node/node_modules/chai/lib/chai/utils/addChainableMethod.js
752	%%DATADIR%%/js/node/node_modules/chai/lib/chai/utils/addMethod.js	753	%%DATADIR%%/js/node/node_modules/chai/lib/chai/utils/addMethod.js
Lines 853-858 Link Here
853	%%DATADIR%%/js/node/node_modules/error-stack-parser/node_modules/stackframe/package.json	854	%%DATADIR%%/js/node/node_modules/error-stack-parser/node_modules/stackframe/package.json
854	%%DATADIR%%/js/node/node_modules/error-stack-parser/node_modules/stackframe/stackframe.js	855	%%DATADIR%%/js/node/node_modules/error-stack-parser/node_modules/stackframe/stackframe.js
855	%%DATADIR%%/js/node/node_modules/error-stack-parser/package.json	856	%%DATADIR%%/js/node/node_modules/error-stack-parser/package.json
		857	%%DATADIR%%/js/node/node_modules/expect.js/History.md
		858	%%DATADIR%%/js/node/node_modules/expect.js/README.md
		859	%%DATADIR%%/js/node/node_modules/expect.js/index.js
		860	%%DATADIR%%/js/node/node_modules/expect.js/package.json
856	%%DATADIR%%/js/node/node_modules/extendible/.travis.yml	861	%%DATADIR%%/js/node/node_modules/extendible/.travis.yml
857	%%DATADIR%%/js/node/node_modules/extendible/README.md	862	%%DATADIR%%/js/node/node_modules/extendible/README.md
858	%%DATADIR%%/js/node/node_modules/extendible/example/index.js	863	%%DATADIR%%/js/node/node_modules/extendible/example/index.js