bareos-Fedora28.patch (2,494 bytes)
diff -Nur bareos-Release-17.2.5.org/src/dird/Makefile.in bareos-Release-17.2.5/src/dird/Makefile.in
--- bareos-Release-17.2.5.org/src/dird/Makefile.in 2018-05-27 17:03:37.989752470 +0200
+++ bareos-Release-17.2.5/src/dird/Makefile.in 2018-05-27 17:19:48.612474946 +0200
@@ -53,7 +53,7 @@
TSTFNDSRCS = testfind.c dird_conf.c ua_acl.c ua_audit.c run_conf.c inc_conf.c
TSTFNDOBJS = $(TSTFNDSRCS:.c=.o)
-INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include -I$(basedir)/lmdb -I$(basedir)/ndmp
+INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include -I$(basedir)/lmdb -I$(basedir)/ndmp -I/usr/include/tirpc
JANSSON_CPPFLAGS = @JANSSON_INC@
diff -Nur bareos-Release-17.2.5.org/src/ndmp/Makefile.in bareos-Release-17.2.5/src/ndmp/Makefile.in
--- bareos-Release-17.2.5.org/src/ndmp/Makefile.in 2018-05-27 17:03:37.972752420 +0200
+++ bareos-Release-17.2.5/src/ndmp/Makefile.in 2018-05-27 17:32:39.240459917 +0200
@@ -79,8 +79,9 @@
WRAP_TAR_OBJS = $(WRAP_TAR_SRCS:.c=.lo)
WRAP_TEST_OBJS = $(WRAP_TEST_SRCS:.c=.lo)
-INCLUDES += -I. -I$(srcdir) -I$(basedir) -I$(basedir)/include
+INCLUDES += -I. -I$(srcdir) -I$(basedir) -I$(basedir)/include -I/usr/include/tirpc
CFLAGS += -DNDMOS_OPTION_PRETTYPRINT_HUMAN_READABLE_IP
+LDFLAGS += -ltirpc
# CFLAGS += -DNDMOS_OPTION_NO_TEST_AGENTS
.SUFFIXES: .c .cc .o .lo .ch .dvi .pdf .tex .view .w .1
@@ -90,11 +91,11 @@
# inference rules
.c.o:
@echo "Compiling $<"
- $(NO_ECHO)$(CC) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(INCLUDES) $(DINCLUDE) $(CFLAGS) $<
+ $(NO_ECHO)$(CC) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(INCLUDES) $(DINCLUDE) $(CFLAGS) $(LDFLAGS) $<
.c.lo:
@echo "Compiling $<"
- $(NO_ECHO)$(LIBTOOL_COMPILE) $(CC) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(INCLUDES) $(DINCLUDE) $(CFLAGS) $<
+ $(NO_ECHO)$(LIBTOOL_COMPILE) $(CC) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(INCLUDES) $(DINCLUDE) $(CFLAGS) $(LDFLAGS) $<
.cc.o:
@echo "Compiling $<"
diff -Nur bareos-Release-17.2.5.org/src/stored/Makefile.in bareos-Release-17.2.5/src/stored/Makefile.in
--- bareos-Release-17.2.5.org/src/stored/Makefile.in 2018-05-27 17:03:37.976752432 +0200
+++ bareos-Release-17.2.5/src/stored/Makefile.in 2018-05-27 17:22:03.298817998 +0200
@@ -91,7 +91,7 @@
DROPLET_INC = @DROPLET_INC@
GLUSTER_INC = @GLUSTER_INC@
RADOS_INC = @RADOS_INC@
-INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include
+INCLUDES += -I$(srcdir) -I$(basedir) -I$(basedir)/include -I/usr/include/tirpc
JANSSON_CPPFLAGS = @JANSSON_INC@