[X2Go-Commits] [x2godesktopsharing] 07/13: debian/rules: Pass-through of compiler flags to qmake call.

git-admin at x2go.org git-admin at x2go.org
Mon Nov 12 14:32:33 CET 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2godesktopsharing.

commit dd08460196b399bb34ecf1da7c922b45669eb8b3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Nov 11 19:54:24 2018 +0100

    debian/rules: Pass-through of compiler flags to qmake call.
---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index d813259..3a75a24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ x2godesktopsharing (3.1.1.5-0x2go1) UNRELEASED; urgency=medium
     + Add dh_clean override, so that the build dir gets tidied up
       properly after build (this really needs to go into the qmake
       .pro file, but debian/rules is easier...).
+    + Pass-through of compiler flags to qmake call.
   * debian/x2godesktopsharing.menu:
     + Drop file. The menu file is not allowed if a .desktop file is present.
   * debian/<config>:
diff --git a/debian/rules b/debian/rules
index e0d7762..da63bb0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ export QT_SELECT=qt5
 
 override_dh_auto_build:
 	lrelease x2godesktopsharing.pro
-	qmake x2godesktopsharing.pro
+	qmake QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" x2godesktopsharing.pro
 
 override_dh_install:
 	install -m 644 x2godesktopsharing $(CURDIR)/debian/x2godesktopsharing/usr/bin/

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git


More information about the x2go-commits mailing list