[X2Go-Commits] [x2goclient] 01/02: Makefile: clear out LDFLAGS, add new (cleared) LIBS variable and pass down as QMAKE_LIBS.

[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 8d1694fd7356c2674394aa1bf06afb0e58e29b55
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu May 23 06:20:12 2019 +0200

    Makefile: clear out LDFLAGS, add new (cleared) LIBS variable and pass down as QMAKE_LIBS.
    
    The previous behavior was leading to compile failures on arm64 machines
    (albeit only old distro versions, apparently), because QMAKE_LFLAGS is
    being put on the command line *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.
---
 Makefile         | 5 +++--
 debian/changelog | 7 +++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a87b21f..15ddac1 100755
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,8 @@ QMAKE_BINARY=qmake-qt4
 LRELEASE_BINARY=lrelease-qt4
 QMAKE_OPTS=
 
-LDFLAGS+=-lldap -lcups -lX11 -lXpm
+LDFLAGS=
+LIBS=
 
 
 #####################################################################
@@ -67,7 +68,7 @@ build: build_man
 
 build_client:
 	$(LRELEASE_BINARY) x2goclient.pro
-	mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" $(QMAKE_OPTS) ../x2goclient.pro
+	mkdir -p $(CLIENT_DIR) && cd $(CLIENT_DIR) && $(QMAKE_BINARY) QMAKE_CFLAGS="${CPPFLAGS} ${CFLAGS}" QMAKE_CXXFLAGS="${CPPFLAGS} ${CXXFLAGS}" QMAKE_LFLAGS="${LDFLAGS}" QMAKE_LIBS="${LIBS}" $(QMAKE_OPTS) ../x2goclient.pro
 	cd $(CLIENT_DIR) && $(MAKE)
 
 build_man:
diff --git a/debian/changelog b/debian/changelog
index c8ad23c..529986b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -73,6 +73,13 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium
       --libssh-debug and debug (packet) log level with --libssh-packetlog.
     - src/sshmasterconnection.cpp: fix compiler warning due to mismatching
       argument with older libssh versions.
+    - Makefile: clear out LDFLAGS, add new (cleared) LIBS variable and pass
+      down as QMAKE_LIBS. The previous behavior was leading to compile
+      failures on arm64 machines (albeit only old distro versions,
+      apparently), because QMAKE_LFLAGS is being put on the command line
+      *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.
   * debian/control:
     + Add build-depend on pkg-config.
   * x2goclient.spec:

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