cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix build of sysutils/bareos-client-static

Browse Source 
- Add additional jamsson support path files
- Bump PORTREVISION
This commit is contained in:
Jose Alonso Cardenas Marquez 2016-02-01 23:47:51 +00:00
parent 3c6e1f4e3d
commit 3e07041fa1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=407785
4 changed files with 52 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/bareos-client-static/Makefile
View File

@ -22,6 +22,8 @@ CONFIGURE_ARGS+= --enable-client-only \
--enable-static-cons \
--disable-libtool \
--disable-build-dird \
--disable-build-stored
--disable-build-stored \
--with-jansson=${LOCALBASE}
.include "${MASTERDIR}/Makefile"

2
sysutils/bareos-client/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= bareos
PORTREVISION= 1
PORTREVISION= 2
PKGNAMESUFFIX= -client
COMMENT= Backup archiving recovery open sourced (client)

25
sysutils/bareos-server/files/patch-src-console-Makefile.in Normal file
View File

@ -0,0 +1,25 @@
--- src/console/Makefile.in 2015-12-03 03:22:54.000000000 -0500
+++ src/console/Makefile.in 2016-02-01 18:21:25.511282000 -0500
@@ -29,6 +29,7 @@
CONS_LDFLAGS = @CONS_LDFLAGS@
JANSSON_CPPFLAGS = @JANSSON_INC@
+JANSSON_LDFLAGS = @JANSSON_LIBS@
INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include
@@ -52,12 +53,12 @@
bconsole: Makefile $(CONSOBJS) ../lib/libbareos$(DEFAULT_ARCHIVE_TYPE) ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
$(DLIB) $(CONS_LIBS) -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
+ $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
static-bconsole: Makefile $(CONSOBJS) ../lib/libbareos.a ../lib/libbareoscfg$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
$(DLIB) $(CONS_LIBS) -lbareoscfg -lbareos -lm $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS) $(GNUTLS_LIBS)
+ $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS)
strip $@

27
sysutils/bareos-server/files/patch-src-filed-Makefile.in
View File

@ -1,11 +1,30 @@
--- src/filed/Makefile.in 2015-08-08 14:17:28.058350000 -0500
+++ src/filed/Makefile.in 2015-08-08 14:17:49.001877000 -0500
@@ -84,7 +84,7 @@
--- src/filed/Makefile.in 2015-12-03 03:22:54.000000000 -0500
+++ src/filed/Makefile.in 2016-02-01 18:17:25.879376000 -0500
@@ -25,6 +25,7 @@
GNUTLS_LIBS_NONSHARED = @GNUTLS_LIBS_NONSHARED@
JANSSON_CPPFLAGS = @JANSSON_INC@
+JANSSON_LDFLAGS = @JANSSON_LIBS@
COMPRESS_CPPFLAGS += @ZLIB_INC@ @LZO_INC@ @FASTLZ_INC@
first_rule: all
@@ -76,7 +77,7 @@
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
$(FDLIBS) -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) \
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED)
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS_NONSHARED) $(GNUTLS_LIBS_NONSHARED) $(JANSSON_LDFLAGS)
static-bareos-fd: Makefile $(SVROBJS) \
../findlib/libbareosfind.a \
@@ -84,8 +85,8 @@
../lib/libbareos$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
- $(FDLIBS) -lbareosfind -lbareoscfg -lbareos -lm $(LIBS) \
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS)
+ -lbareosfind -lbareoscfg -lbareos -lm $(FDLIBS) $(LIBS) \
$(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS)
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(JANSSON_LDFLAGS)
strip $@
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status