summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Spradling2016-09-23 22:08:44 -0400
committerMichael Spradling2016-09-23 22:08:44 -0400
commitd7f1b22c55dc81063967423cf8763202a7916bf7 (patch)
tree730de674d7811b2f61db1b6e6a600e917cfcc69c
parent2d1737002eeb77a19b20f493d88bc9ab260ff85b (diff)
downloadaur-d7f1b22c55dc81063967423cf8763202a7916bf7.tar.gz
Allow bareos 15.2.4 to work with gcc 6.1.1
Removed optimizations from cflags
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD2
-rw-r--r--PKGBUILD.common4
3 files changed, 12 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 101a0055e94..bd45f809318 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -18,7 +18,7 @@ pkgbase = bareos
source = https://github.com/bareos/bareos/archive/Release/15.2.4.tar.gz
source = PKGBUILD.common
sha256sums = dde2b0b1ed8d878f9731cee9c7f723e3bac479b5fb367e61efca636465b40ebb
- sha256sums = f864fd8267764ead7c83c5999dc780a8c37e4755842b036910416128288fd280
+ sha256sums = 73337cb138a8e87cc4725b66027e003525d927b1bb3bc1f6ecd43888df895556
pkgname = bareos-common
pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Common files
@@ -31,7 +31,7 @@ pkgname = bareos-bconsole
groups = bareos
groups = bareos-client
depends = bareos-common=15.2.4
- backup = etc/bareos/bconsole.conf
+ backup =
pkgname = bareos-database-common
pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Generic abstration libs and tools for sql catalog
@@ -73,14 +73,13 @@ pkgname = bareos-director
pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Director daemon
install = bareos-director.install
depends = bareos-common=15.2.4
- backup = etc/bareos/bareos-dir.conf
- backup = etc/logrotate.d/bareos-dir
+ backup =
pkgname = bareos-storage-fifo
pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - FIFO support for storage daemon
install = bareos-storage-fifo.install
depends = bareos-storage=15.2.4
- backup = etc/bareos/bareos-sd.d/device-fifo.conf
+ backup =
pkgname = bareos-tools
pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - CLI tools (bcopy, bextract, bls, bregeq, bwild)
@@ -93,7 +92,7 @@ pkgname = bareos-filedaemon
groups = bareos
groups = bareos-client
depends = bareos-common=15.2.4
- backup = etc/bareos/bareos-fd.conf
+ backup =
pkgname = bareos-storage
pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Storage daemon
@@ -101,15 +100,14 @@ pkgname = bareos-storage
depends = bareos-common=15.2.4
optdepends = openssl: network encryption between daemons
optdepends = lzo2: LZO compression for Storage Daemon
- backup = etc/bareos/bareos-sd.conf
+ backup =
pkgname = bareos-storage-tape
pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Tape support for storage daemon
install = bareos-storage-tape.install
depends = bareos-storage=15.2.4
depends = mtx
- backup = etc/bareos/bareos-sd.d/device-tape-with-autoloader.conf
- backup = etc/bareos/mtx-changer.conf
+ backup =
pkgname = bareos-director-python-plugin
pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Python plugin for director daemon
diff --git a/PKGBUILD b/PKGBUILD
index b36f5a236f9..bc87517f5db 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,4 +26,4 @@ source=("https://github.com/bareos/bareos/archive/Release/${pkgver}.tar.gz"
"PKGBUILD.common")
sha256sums=('dde2b0b1ed8d878f9731cee9c7f723e3bac479b5fb367e61efca636465b40ebb'
- 'f864fd8267764ead7c83c5999dc780a8c37e4755842b036910416128288fd280')
+ '73337cb138a8e87cc4725b66027e003525d927b1bb3bc1f6ecd43888df895556')
diff --git a/PKGBUILD.common b/PKGBUILD.common
index b7a0c27801f..c0ff4a05da9 100644
--- a/PKGBUILD.common
+++ b/PKGBUILD.common
@@ -63,6 +63,10 @@ prepare() {
}
build() {
+ # bareos 15.2 doesn't work with gcc 6.1.1 and newer with optimizations
+ export CFLAGS="${CFLAGS/O2/O0}"
+ export CXXFLAGS="${CXXFLAGS/O2/O0}"
+
pushd "${_pkgsrc}" &> /dev/null
QMAKE="/usr/bin/qmake-qt4" DISTNAME="debian" ./configure $_configure_args
make DESTDIR="$_instdir" install