[pkg-remote-commits] [freerdp2] 01/12: debian/{control, rules}: Don't build the wayland part of FreeRDP on non-Linux systems.

[Mike Gabriel]

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

sunweaver pushed a commit to branch master
in repository freerdp2.

commit 16eeb83b1f5e35ac300c15730185f67013e69dad
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Oct 21 22:17:00 2017 +0200

    debian/{control,rules}: Don't build the wayland part of FreeRDP on non-Linux systems.
---
 debian/control | 8 ++++----
 debian/rules   | 9 ++++++++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 72b7723..e67f27e 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Build-Depends:
  uuid-dev,
  libgstreamer1.0-dev,
  libgstreamer-plugins-base1.0-dev,
- libwayland-dev,
+ libwayland-dev [linux-any],
  libxkbcommon-dev
 Standards-Version: 4.0.0
 Homepage: http://www.freerdp.com/
@@ -249,7 +249,7 @@ Description: FreeRDP x11 shadowing server
  share an already started X11 DISPLAY.
 
 Package: libuwac0-0
-Architecture: any
+Architecture: linux-any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -264,7 +264,7 @@ Description: Using wayland as a client library
 
 Package: libuwac0-dev
 Section: libdevel
-Architecture: any
+Architecture: linux-any
 Multi-Arch: same
 Depends:
  ${misc:Depends},
@@ -276,7 +276,7 @@ Description: Using wayland as a client (development files)
  This package contains the libuwac development files
 
 Package: freerdp2-wayland
-Architecture: any
+Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: RDP client for Windows Terminal Services (wayland client)
  FreeRDP is a libre client/server implementation of the Remote
diff --git a/debian/rules b/debian/rules
index bd40883..8984d3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,13 @@ else
 WITH_NEON =
 endif
 
+DEB_HOST_ARCH_OS=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+ifeq (,$(filter linux, $(DEB_HOST_ARCH_OS)))
+WITH_WAYLAND = -DWITH_WAYLAND=OFF
+else
+WITH_WAYLAND =
+endif
+
 NULL =
 
 DEB_HOST_ARCH_OS=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
@@ -42,7 +49,7 @@ DEB_CMAKE_EXTRA_FLAGS :=  -DCMAKE_INSTALL_INCLUDEDIR=include/$(shell dpkg-archit
                           -DWITH_SERVER=ON \
                           -DBUILD_TESTING=OFF \
                           -DCMAKE_BUILD_TYPE=RELWITHDEBINFO \
-                          -DWITH_WAYLAND=ON \
+                          $(WITH_WAYLAND) \
                           -DWITH_CLIENT_INTERFACE=OFF \
                           $(WITH_NEON) \
                           $(NULL)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/freerdp2.git