mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

Fix build after json-c update.

Browse Source 
rsyslog8-devel fails to build against the new json-c, so I've marked it
BROKEN.
This commit is contained in:
Adam Weinberger 2014-08-20 15:59:09 +00:00
parent 162780ab62
commit 6abb9fe776
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=365473
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sysutils/rsyslog7-devel/Makefile
View File

@ -13,7 +13,7 @@ BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt
LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \
libestr.so:${PORTSDIR}/devel/libestr \
libjson.so:${PORTSDIR}/devel/json-c \
libjson-c.so:${PORTSDIR}/devel/json-c \
libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
USE_LDCONFIG= yes

13
sysutils/rsyslog7-devel/files/patch-runtime__lookup.c Normal file
View File

@ -0,0 +1,13 @@
--- ./runtime/lookup.c.orig 2014-08-20 11:50:14.000000000 -0400
+++ ./runtime/lookup.c 2014-08-20 11:52:52.000000000 -0400
@@ -26,8 +26,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <json/json.h>
-#include <json/json.h>
+#include <json-c/json.h>
+#include <json-c/json.h>
#include <assert.h>
#include "rsyslog.h"

2
sysutils/rsyslog7/Makefile
View File

@ -13,7 +13,7 @@ BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt
LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \
libestr.so:${PORTSDIR}/devel/libestr \
libjson.so:${PORTSDIR}/devel/json-c \
libjson-c.so:${PORTSDIR}/devel/json-c \
liblogging-stdlog.so:${PORTSDIR}/devel/liblogging
USE_LDCONFIG= yes

4
sysutils/rsyslog8-devel/Makefile
View File

@ -13,7 +13,7 @@ BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt
LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \
libestr.so:${PORTSDIR}/devel/libestr \
libjson.so:${PORTSDIR}/devel/json-c \
libjson-c.so:${PORTSDIR}/devel/json-c \
liblogging-stdlog.so:${PORTSDIR}/devel/liblogging \
libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
@ -36,6 +36,8 @@ SNMP_DESC= SNMP trap sender for rsyslog
USES= libtool pkgconfig
BROKEN= fails to build with new json-c
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MDBI}

2
sysutils/rsyslog8/Makefile
View File

@ -13,7 +13,7 @@ BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt
LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \
libestr.so:${PORTSDIR}/devel/libestr \
libjson.so:${PORTSDIR}/devel/json-c \
libjson-c.so:${PORTSDIR}/devel/json-c \
liblogging-stdlog.so:${PORTSDIR}/devel/liblogging \
libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid