[pkg-remote-commits] [xrdp] 03/07: Stop requiring FUSE on Hurd, it’s missing some features, for now.

[Thorsten Glaser]

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

tg pushed a commit to branch master
in repository xrdp.

commit e34f51821d7237b55de00a2ff1b3f54fe7ebe31f
Author: mirabilos <t.glaser at tarent.de>
Date:   Wed Jan 25 11:34:34 2017 +0100

    Stop requiring FUSE on Hurd, it’s missing some features, for now.
---
 debian/changelog |  3 ++-
 debian/control   |  4 ++--
 debian/rules     | 23 ++++++++++++++++-------
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b10eef1..f4ef4b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xrdp (0.9.1-4) unstable; urgency=high
 
   * Fix up PAM conffile handling for upgrades from jessie{,-backports}.
+  * Don’t use FUSE on the Hurd, it does not support enough of it yet.
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 25 Jan 2017 11:18:26 +0100
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 25 Jan 2017 11:34:16 +0100
 
 xrdp (0.9.1-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 7f55d81..bb0fab5 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
  automake (>= 1.6),
  debhelper (>= 9),
  dh-systemd,
- libfuse-dev,
+ libfuse-dev [!hurd-any],
  libjpeg-dev,
  libopus-dev,
  libpam0g-dev,
@@ -42,7 +42,7 @@ Depends:
  ${misc:Depends},
  ${shlibs:Depends},
 Recommends:
- fuse,
+ fuse [!hurd-any],
  xorgxrdp,
 Suggests:
  guacamole,
diff --git a/debian/rules b/debian/rules
index 33eb9f9..1d9d0ea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,6 +31,11 @@ ifeq (x32,${DEB_HOST_ARCH})
 CONFIGURE_ARGS+=	--without-simd
 endif
 
+ifeq (hurd,${DEB_HOST_ARCH_OS})
+# fuse_lowlevel.h is not yet usable
+CONFIGURE_ARGS+=	--disable-fuse
+endif
+
 %:
 	dh $@ --with systemd
 
@@ -38,20 +43,24 @@ override_dh_auto_configure:
 	./bootstrap
 	cd xorgxrdp && ./bootstrap
 	cd librfxcodec && ./bootstrap
-	./configure ${CONFIGURE_ARGS} \
+	./configure \
 	    --enable-ipv6 \
 	    --enable-jpeg \
 	    --enable-fuse \
 	    --enable-rfxcodec \
 	    --enable-opus \
-	    --enable-painter
-	cd xorgxrdp && ./configure ${CONFIGURE_ARGS}
-	cd librfxcodec && ./configure ${CONFIGURE_ARGS} \
+	    --enable-painter \
+	    ${CONFIGURE_ARGS}
+	cd xorgxrdp && ./configure \
+	    ${CONFIGURE_ARGS}
+	cd librfxcodec && ./configure \
 	    --disable-shared \
-	    --enable-static
-	cd libpainter && ./configure ${CONFIGURE_ARGS} \
+	    --enable-static \
+	    ${CONFIGURE_ARGS}
+	cd libpainter && ./configure \
 	    --disable-shared \
-	    --enable-static
+	    --enable-static \
+	    ${CONFIGURE_ARGS}
 	find . -name Makefile -print0 | \
 	    xargs -0 perl -pi -e 's!XRDP_PID_PATH.*?/run!$$&/xrdp!g' --
 

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