This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from b54ff5b src/sshmasterconnection.cpp: fix compiler warning due to mismatching argument with older libssh versions. new 8d1694f Makefile: clear out LDFLAGS, add new (cleared) LIBS variable and pass down as QMAKE_LIBS. new ac0d0d6 x2goclient.pro: add libraries that we always want to use on Linux correctly to LIBS and use a bigger catch clause. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: Makefile | 5 +++-- debian/changelog | 12 ++++++++++++ x2goclient.pro | 9 ++------- 3 files changed, 17 insertions(+), 9 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
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@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
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@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
-
git-admin＠x2go.org