tomjbe 14/04/10 16:13:10
Added: bacula-7.0.2-fix-static.patch
bacula-7.0.2-depend.patch
Log:
Major version bump.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
0x762053D5)
Revision Changes Path
1.1 app-backup/bacula/files/7.0.2/bacula-7.0.2-fix-static.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/7.0.2/bacula-7.0.2-fix-static.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/7.0.2/bacula-7.0.2-fix-static.patch?rev=1.1&content-type=text/plain
Index: bacula-7.0.2-fix-static.patch
===================================================================
--- src/console/Makefile.in.orig 2011-10-30 14:10:41.100802721 -0400
+++ src/console/Makefile.in 2011-10-30 14:14:42.330488174 -0400
@@ -29,10 +29,11 @@
GETTEXT_LIBS = @LIBINTL@
CONS_INC=@CONS_INC@
CONS_LIBS=@CONS_LIBS@
CONS_LDFLAGS=@CONS_LDFLAGS@
+ZLIBS=@ZLIBS@
.SUFFIXES: .c .o
.PHONY:
.DONTCARE:
@@ -46,17 +47,17 @@
@echo " "
bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o
$@ $(CONSOBJS) \
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS)
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
+ $(OPENSSL_LIBS) $(LIBS)
static-bconsole: Makefile $(CONSOBJS) ../lib/libbac.a
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib
-L../cats -o $@ $(CONSOBJS) \
- $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
- $(OPENSSL_LIBS)
+ $(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(ZLIBS) $(GETTEXT_LIBS) \
+ $(OPENSSL_LIBS) $(LIBS) $(ZLIBS)
strip $@
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
cd $(topdir) \
--- src/filed/Makefile.in.orig 2012-06-28 16:52:03.000000000 +0200
+++ src/filed/Makefile.in 2012-08-16 11:08:09.000000000 +0200
@@ -89,13 +89,13 @@
bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE)
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
@echo "Linking $@ ..."
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o
$@ $(SVROBJS) \
- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS) \
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
$(AFS_LIBS) $(LZO_LIBS)
+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS)
$(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a
../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE)
$(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib
-L../findlib -o $@ $(SVROBJS) \
- $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm $(LIBS)
\
- $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS)
$(AFS_LIBS) $(LZO_LIBS)
+ $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbaccfg -lbac -lm \
+ $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(LIBS)
$(CAP_LIBS) $(AFS_LIBS) $(LZO_LIBS)
strip $@
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
1.1 app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-backup/bacula/files/7.0.2/bacula-7.0.2-depend.patch?rev=1.1&content-type=text/plain
Index: bacula-7.0.2-depend.patch
===================================================================
# fix file not found error during make depend
--- src/tools/Makefile.in.orig 2012-09-20 20:42:54.000000000 +0200
+++ src/tools/Makefile.in 2012-09-20 20:35:46.000000000 +0200
@@ -194,7 +194,7 @@
@$(MV) Makefile Makefile.bak
@$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
@$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
- @$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) *.c >> Makefile
+ @$(CXX) -S -M $(CPPFLAGS) -I$(srcdir) -I$(basedir) -I../filed -I../dird
-I../stored *.c >> Makefile
@if test -f Makefile ; then \
$(RMF) Makefile.bak; \
else \
