diff --git a/.cirrus.yml b/.cirrus.yml index a86d7dfc..72cf7727 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -6,11 +6,11 @@ FreeBSD_task: freebsd_instance: image_family: freebsd-12-2 prepare_script: - - pkg install -y $SSL git autoconf automake libtool pkgconf opus jpeg-turbo fdk-aac pixman libX11 libXfixes libXrandr nasm + - pkg install -y $SSL git autoconf automake libtool pkgconf opus jpeg-turbo fdk-aac pixman libX11 libXfixes libXrandr nasm fusefs-libs - git submodule update --init --recursive configure_script: - ./bootstrap - - env CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./configure --localstatedir=/var --enable-strict-locations --with-pkgconfigdir=/usr/local/libdata/pkgconfig --enable-strict-locations --enable-ipv6 --enable-opus --enable-jpeg --enable-fdkaac --enable-painter --enable-pixman + - env CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib ./configure --localstatedir=/var --enable-strict-locations --with-pkgconfigdir=/usr/local/libdata/pkgconfig --enable-strict-locations --enable-ipv6 --enable-opus --enable-jpeg --enable-fdkaac --enable-painter --enable-pixman --enable-fuse build_script: - make -j $(sysctl -n hw.ncpu || echo 4) install_script: diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am index 767ac27b..1a57a563 100644 --- a/sesman/chansrv/Makefile.am +++ b/sesman/chansrv/Makefile.am @@ -18,7 +18,7 @@ endif CHANSRV_EXTRA_LIBS = if XRDP_FUSE -AM_CPPFLAGS += -DXRDP_FUSE $(FUSE_CFLAGS) +AM_CPPFLAGS += -DXRDP_FUSE $(FUSE_CFLAGS) -DFUSE_USE_VERSION=26 CHANSRV_EXTRA_LIBS += $(FUSE_LIBS) endif diff --git a/sesman/chansrv/chansrv_fuse.c b/sesman/chansrv/chansrv_fuse.c index f29ea0ed..74ac06d1 100644 --- a/sesman/chansrv/chansrv_fuse.c +++ b/sesman/chansrv/chansrv_fuse.c @@ -130,7 +130,12 @@ void xfuse_devredir_cb_file_close(struct state_close *fip) ** ** ******************************************************************************/ -#define FUSE_USE_VERSION 26 +/* FUSE_USE_VERSION must be defined globally for other parts of + * xrdp-chansrv which include for definitions. Check + * it's actually defined here */ +#ifndef FUSE_USE_VERSION +#error Define FUSE_USE_VERSION in the make system and recompile +#endif #include #include