mirrors/xrdp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enabling fuse for 32-bit CI builds

Browse Source
This commit is contained in:
Alexandre Quesnel 2020-09-08 17:16:09 +00:00
parent f2dda1e0bd
commit ec53a0398d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -82,17 +82,17 @@ max_x86_deps: &max_x86_deps
- libxrandr-dev:i386 - libxrandr-dev:i386
- libxrender-dev:i386 - libxrender-dev:i386
- openssl:i386 - openssl:i386
- libfuse-dev:i386
# No --enable-pixman to allow testing the replacement code # No --enable-pixman to allow testing the replacement code
# No --enable-fuse due to failing libfuse-dev:i386 package install
max_x86_conf: &max_x86_conf max_x86_conf: &max_x86_conf
env: env:
- CONF_FLAGS="--enable-ipv6 --enable-jpeg --disable-fuse --enable-mp3lame - CONF_FLAGS="--enable-ipv6 --enable-jpeg --enable-fuse --enable-mp3lame
--enable-fdkaac --enable-opus --enable-rfxcodec --enable-painter --enable-fdkaac --enable-opus --enable-rfxcodec --enable-painter
--disable-pixman --host=i686-linux" --disable-pixman --host=i686-linux"
- PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig - PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
- CFLAGS=-m32 - CFLAGS="-m32"
- LDFLAGS=-m32 - LDFLAGS="-m32"
addons: addons:
apt: apt:
packages: packages:
@ -154,5 +154,5 @@ matrix:
script: script:
- ./bootstrap - ./bootstrap
- ./configure $CONF_FLAGS - ./configure $CONF_FLAGS
- make CFLAGS="$CFLAGS" - make
- test -z "$DISTCHECK" || make distcheck - test -z "$DISTCHECK" || make distcheck

3
configure.ac
View File

@ -406,6 +406,9 @@ echo " exec_prefix $exec_prefix"
echo " libdir $libdir" echo " libdir $libdir"
echo " bindir $bindir" echo " bindir $bindir"
echo " sysconfdir $sysconfdir" echo " sysconfdir $sysconfdir"
echo ""
echo " CFLAGS = $CFLAGS"
echo " LDFLAGS = $LDFLAGS"
# xrdp_configure_options.h will be written to the build directory, not the source directory # xrdp_configure_options.h will be written to the build directory, not the source directory
echo '#define XRDP_CONFIGURE_OPTIONS \' > ./xrdp_configure_options.h echo '#define XRDP_CONFIGURE_OPTIONS \' > ./xrdp_configure_options.h