Page MenuHomeFreeBSD
Files F98910201

D42979.id131195.diff
No OneTemporary
Actions

D42979.id131195.diff
View Options

Index: sysutils/bacula11-client/Makefile
===================================================================
--- sysutils/bacula11-client/Makefile
+++ sysutils/bacula11-client/Makefile
@@ -3,9 +3,6 @@
COMMENT= Network backup solution (client)
-BROKEN_aarch64= Fails to link: missing sbrk
-BROKEN_riscv64= Fails to link: missing sbrk
-
WITH_CLIENT_ONLY=yes
USE_RC_SUBR= bacula-fd
Index: sysutils/bacula11-server/Makefile
===================================================================
--- sysutils/bacula11-server/Makefile
+++ sysutils/bacula11-server/Makefile
@@ -1,6 +1,6 @@
PORTNAME= bacula
PORTVERSION= 11.0.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= sysutils
MASTER_SITES= SF/bacula/bacula/${PORTVERSION}
PKGNAMEPREFIX?= #
Index: sysutils/bacula11-server/files/patch-src_lib_bsys.c
===================================================================
--- /dev/null
+++ sysutils/bacula11-server/files/patch-src_lib_bsys.c
@@ -0,0 +1,29 @@
+--- src/lib/bsys.c.orig
++++ src/lib/bsys.c
+@@ -1270,7 +1270,7 @@
+ /*
+ * Determine the amount of heap used
+ * macOS - sbrk(0) is deprecated, use malloc info
+- * Windows - not implemented
++ * Windows - not implemented and FreeBSD
+ * others - use sbrk(0)
+ */
+
+@@ -1279,7 +1279,7 @@
+
+ void mark_heap()
+ {
+-#if defined(HAVE_WIN32)
++#if defined(HAVE_WIN32) || defined(__FreeBSD__)
+ start_heap = 0;
+ #elif defined(HAVE_DARWIN_OS)
+ struct mstats ms = mstats();
+@@ -1296,6 +1296,8 @@
+ #elif defined(HAVE_DARWIN_OS)
+ struct mstats ms = mstats();
+ return (int64_t) ms.bytes_used - start_heap;
++#elif defined(__FreeBSD__)
++ return 0;
+ #else
+ return (int64_t) sbrk(0) - start_heap;
+ #endif
Index: sysutils/bacula13-client/Makefile
===================================================================
--- sysutils/bacula13-client/Makefile
+++ sysutils/bacula13-client/Makefile
@@ -3,9 +3,6 @@
COMMENT= Network backup solution (client)
-BROKEN_aarch64= Fails to link: missing sbrk
-BROKEN_riscv64= Fails to link: missing sbrk
-
WITH_CLIENT_ONLY=yes
USE_RC_SUBR= bacula-fd
Index: sysutils/bacula13-server/Makefile
===================================================================
--- sysutils/bacula13-server/Makefile
+++ sysutils/bacula13-server/Makefile
@@ -1,5 +1,6 @@
PORTNAME= bacula
DISTVERSION= 13.0.3
+PORTREVISION= 1
CATEGORIES?= sysutils
MASTER_SITES= SF/bacula/bacula/${PORTVERSION}
PKGNAMEPREFIX?= #
Index: sysutils/bacula13-server/files/patch-src_lib_bsys.c
===================================================================
--- /dev/null
+++ sysutils/bacula13-server/files/patch-src_lib_bsys.c
@@ -0,0 +1,29 @@
+--- src/lib/bsys.c.orig
++++ src/lib/bsys.c
+@@ -1270,7 +1270,7 @@
+ /*
+ * Determine the amount of heap used
+ * macOS - sbrk(0) is deprecated, use malloc info
+- * Windows - not implemented
++ * Windows - not implemented and FreeBSD
+ * others - use sbrk(0)
+ */
+
+@@ -1279,7 +1279,7 @@
+
+ void mark_heap()
+ {
+-#if defined(HAVE_WIN32)
++#if defined(HAVE_WIN32) || defined(__FreeBSD__)
+ start_heap = 0;
+ #elif defined(HAVE_DARWIN_OS)
+ struct mstats ms = mstats();
+@@ -1296,6 +1296,8 @@
+ #elif defined(HAVE_DARWIN_OS)
+ struct mstats ms = mstats();
+ return (int64_t) ms.bytes_used - start_heap;
++#elif defined(__FreeBSD__)
++ return 0;
+ #else
+ return (int64_t) sbrk(0) - start_heap;
+ #endif

File Metadata

Mime Type
text/plain
Expires
Sun, Oct 6, 6:39 AM (21 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13711218
Default Alt Text
D42979.id131195.diff (3 KB)

Event Timeline