This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 77508480840b7f73e0c6648d1a296e7480df69b5 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Oct 30 14:48:01 2018 +0100 x2goclient.pro: let static Linux configuration override the new pkgconfig-based libssh usage. --- debian/changelog | 2 ++ x2goclient.pro | 21 +++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index e079673..8a1c111 100644 --- a/debian/changelog +++ b/debian/changelog @@ -32,6 +32,8 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium - x2goclient.pro: detect libssh and libssh_threads via pkgconfig on UNIX-based platforms. libssh_threads is optional if the libssh version is high enough. + - x2goclient.pro: let static Linux configuration override the new + pkgconfig-based libssh usage. -- X2Go Release Manager <git-admin@x2go.org> Tue, 26 Jun 2018 00:39:28 +0200 diff --git a/x2goclient.pro b/x2goclient.pro index 63c5b9a..6cd51b0 100644 --- a/x2goclient.pro +++ b/x2goclient.pro @@ -136,11 +136,21 @@ SOURCES += src/sharewidget.cpp \ unix { isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config - PKGCONFIG += libssh + !x2go_linux_static { + PKGCONFIG += libssh - # Failure to find libssh_threads is non-fatal, since newer libssh versions - # don't ship a separate library any longer. - $$system($$PKG_CONFIG --exists "libssh < 0.8.0"):PKGCONFIG += libssh_threads + # Failure to find libssh_threads is non-fatal, since newer libssh versions + # don't ship a separate library any longer. + $$system($$PKG_CONFIG --exists "libssh < 0.8.0"):PKGCONFIG += libssh_threads + } + else { + # No pkgconfig stuff, because... for some reason we wanted to call the + # library libssh_static. This doesn't sound like a standard name a Linux + # distro would ship, but at the same time I doubt anyone is building this + # package statically anyway. And even if they do, they shouldn't. + # It's also unclear how libssh_threads is called in this scheme. + LIBS += -lssh_static + } } win32 { # pkgconfig is... tricky on Windows. @@ -214,8 +224,7 @@ linux-g++-64 { x2go_linux_static { message("linking all libs statically") DEFINES += __linux__ - LIBS -= -lssh - LIBS += -lssh_static -lssl -lXpm + LIBS += -lssl -lXpm QMAKE_LFLAGS = -Bstatic $$QMAKE_LFLAGS } -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git