From d6b5a6e235b8294046cad61e14214b28bf199784 Mon Sep 17 00:00:00 2001 From: Marc Schiffbauer Date: Wed, 13 May 2020 22:58:15 -0500 Subject: [PATCH] app-backup/bareos: cleanup files Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Marc Schiffbauer --- .../bareos/files/bareos-12.4.5-Makefile.patch | 27 ------------------- .../files/bareos-12.4.5-bat-ldflags.patch | 11 -------- 2 files changed, 38 deletions(-) delete mode 100644 app-backup/bareos/files/bareos-12.4.5-Makefile.patch delete mode 100644 app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch diff --git a/app-backup/bareos/files/bareos-12.4.5-Makefile.patch b/app-backup/bareos/files/bareos-12.4.5-Makefile.patch deleted file mode 100644 index 3cdee15d4db7..000000000000 --- a/app-backup/bareos/files/bareos-12.4.5-Makefile.patch +++ /dev/null @@ -1,27 +0,0 @@ -# stop build if there are errors in subdirs ---- Makefile.in.orig 2010-07-20 16:53:44.000000000 +0000 -+++ Makefile.in 2010-07-20 16:55:50.000000000 +0000 -@@ -44,9 +44,8 @@ - - all: Makefile - @for I in ${all_subdirs}; \ -- do (cd $$I; echo "==>Entering directory `pwd`"; \ -- $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \ -- echo ""; echo ""; exit 1;)); \ -+ do \ -+ $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \ - done - - depend: -@@ -55,9 +54,8 @@ - - bacula-fd: Makefile - @for I in ${fd_subdirs}; \ -- do (cd $$I; echo "==>Entering directory `pwd`"; \ -- $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \ -- echo ""; echo ""; exit 1;)); \ -+ do \ -+ $(MAKE) DESTDIR=$(DESTDIR) -C $$I all || exit 1; \ - done - - #------------------------------------------------------------------------- diff --git a/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch b/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch deleted file mode 100644 index 94d8fb60120e..000000000000 --- a/app-backup/bareos/files/bareos-12.4.5-bat-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ -# bat needs to respect LDFLAGS ---- src/qt-console/bat.pro.in.orig 2010-07-20 18:28:50.000000000 +0000 -+++ src/qt-console/bat.pro.in 2010-07-20 18:29:25.000000000 +0000 -@@ -26,6 +26,7 @@ - QMAKE_LINK = $${LIBTOOL_LINK} $(CXX) - QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p - QMAKE_CLEAN += .libs/* bat -+QMAKE_LFLAGS += @LDFLAGS@ - - qwt { - INCLUDEPATH += @QWT_INC@ -- 2.26.2