commit: a6598606a52d943e65e673eac4bdc10fd0447123
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 16 15:35:36 2023 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Thu Nov 16 15:38:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6598606
app-backup/bacula: further fixes for tray-monitor build
* Do not strip binary
* respect C/CXX/LDFLAGS
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
app-backup/bacula/bacula-13.0.3-r2.ebuild | 5 +++++
app-backup/bacula/files/tray-monitor-pro.patch | 15 +++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/app-backup/bacula/bacula-13.0.3-r2.ebuild
b/app-backup/bacula/bacula-13.0.3-r2.ebuild
index 024d64df49ea..1c404587935e 100644
--- a/app-backup/bacula/bacula-13.0.3-r2.ebuild
+++ b/app-backup/bacula/bacula-13.0.3-r2.ebuild
@@ -126,6 +126,9 @@ src_prepare() {
# bat needs to respect LDFLAGS and CFLAGS
eapply -p0 "${FILESDIR}"/9.0.6/${PN}-9.0.6-bat-pro.patch
+ # tray-monitor needs to respect LDFLAGS and CFLAGS
+ eapply -p0 "${FILESDIR}"/tray-monitor-pro.patch
+
# bug #328701
eapply -p0 "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
@@ -140,6 +143,8 @@ src_prepare() {
# do not strip binaries
sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
+ sed -i -e "s/+= qt$/+= qt nostrip/" \
+ src/qt-console/tray-monitor/tray-monitor.pro.in || die
eapply_user
diff --git a/app-backup/bacula/files/tray-monitor-pro.patch
b/app-backup/bacula/files/tray-monitor-pro.patch
new file mode 100644
index 000000000000..2781903cbb9f
--- /dev/null
+++ b/app-backup/bacula/files/tray-monitor-pro.patch
@@ -0,0 +1,15 @@
+# Build of tray-monitor should respect LDFLAGS and CFLAGS
+--- src/qt-console/tray-monitor/tray-monitor.pro.in.orig 2023-11-16
16:25:31.840100695 +0100
++++ src/qt-console/tray-monitor/tray-monitor.pro.in 2023-11-16
16:26:26.453913247 +0100
+@@ -41,8 +41,9 @@
+ QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)
+ QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
+ QMAKE_CLEAN += obj/* .libs/* bacula-tray-monitor release/bacula-tray-monitor
+-QMAKE_CXXFLAGS += -DTRAY_MONITOR
+-QMAKE_CFLAGS += -DTRAY_MONITOR
++QMAKE_CXXFLAGS += @CXXFLAGS@ -DTRAY_MONITOR
++QMAKE_CFLAGS += @CFLAGS@ -DTRAY_MONITOR
++QMAKE_LFLAGS += @LDFLAGS@
+
+ INSTALLS = bins confs
+
