[X2Go-Commits] [x2goclient] 02/02: x2goclient.pro: add libraries that we always want to use on Linux correctly to LIBS and use a bigger catch clause.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goclient.

commit ac0d0d69f246308f2db65043381efedbb43ffa19
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu May 23 06:27:23 2019 +0200

    x2goclient.pro: add libraries that we always want to use on Linux correctly to LIBS and use a bigger catch clause.
    
    That should work much better, since linux-g++ and linux-g++-64 are
    x86-specific, while there are way more potentially useful targets like
    linux-aarch64-gnu-g++, clang, llvm, icc etc.
---
 debian/changelog | 5 +++++
 x2goclient.pro   | 9 ++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 529986b..e377c7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -80,6 +80,11 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
       *before* the actual object files to be included/linked, which is an
       error for system libraries. Builds will still fail after this commit,
       but that's okay.
+    - x2goclient.pro: add libraries that we always want to use on Linux
+      correctly to LIBS and use a bigger catch clause. That should work much
+      better, since linux-g++ and linux-g++-64 are x86-specific, while there
+      are way more potentially useful targets like linux-aarch64-gnu-g++,
+      clang, llvm, icc etc.
   * debian/control:
     + Add build-depend on pkg-config.
   * x2goclient.spec:
diff --git a/x2goclient.pro b/x2goclient.pro
index 3aaf01c..a4bba4d 100644
--- a/x2goclient.pro
+++ b/x2goclient.pro
@@ -215,13 +215,8 @@ exists(res/txt/changelog) {
   RESOURCES += res/changelog.qrc
 }
 
-linux-g++ {
-  message("building $$TARGET with ldap and cups")
-  LIBS += -lldap -lcups -lX11 -lXpm
-  DEFINES += __linux__
-}
-linux-g++-64 {
-  message("building $$TARGET with ldap and cups")
+linux {
+  message("building $$TARGET via $$QMAKESPEC with ldap and cups")
   LIBS += -lldap -lcups -lX11 -lXpm
   DEFINES += __linux__
 }

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