mirror of https://github.com/neutrinolabs/xrdp
Enable FUSE in cirrus build
This commit is contained in:
parent
95a10f5f02
commit
741be5a4a2
|
@ -6,11 +6,11 @@ FreeBSD_task:
|
||||||
freebsd_instance:
|
freebsd_instance:
|
||||||
image_family: freebsd-12-2
|
image_family: freebsd-12-2
|
||||||
prepare_script:
|
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
|
- git submodule update --init --recursive
|
||||||
configure_script:
|
configure_script:
|
||||||
- ./bootstrap
|
- ./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:
|
build_script:
|
||||||
- make -j $(sysctl -n hw.ncpu || echo 4)
|
- make -j $(sysctl -n hw.ncpu || echo 4)
|
||||||
install_script:
|
install_script:
|
||||||
|
|
|
@ -18,7 +18,7 @@ endif
|
||||||
CHANSRV_EXTRA_LIBS =
|
CHANSRV_EXTRA_LIBS =
|
||||||
|
|
||||||
if XRDP_FUSE
|
if XRDP_FUSE
|
||||||
AM_CPPFLAGS += -DXRDP_FUSE $(FUSE_CFLAGS)
|
AM_CPPFLAGS += -DXRDP_FUSE $(FUSE_CFLAGS) -DFUSE_USE_VERSION=26
|
||||||
CHANSRV_EXTRA_LIBS += $(FUSE_LIBS)
|
CHANSRV_EXTRA_LIBS += $(FUSE_LIBS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -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 <fuse_lowlevel.h> 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 <fuse_lowlevel.h>
|
#include <fuse_lowlevel.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
Loading…
Reference in New Issue