mirror of
https://github.com/X11Libre/xserver.git
synced 2026-01-26 14:03:17 +00:00
.github: fix tetexec.cfg creation
We need to run the Xts build inside Xvfb, because it needs a running Xserver for creating tetexec.cfg. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
parent
dc6c3c39c2
commit
825e908d54
2
.github/scripts/install-prereq.sh
vendored
2
.github/scripts/install-prereq.sh
vendored
@ -16,6 +16,8 @@ build_ac xorgproto https://gitlab.freedesktop.org/xorg/proto/xorgpr
|
||||
if [ "$X11_OS" = "Darwin" ]; then
|
||||
build_ac xset https://gitlab.freedesktop.org/xorg/app/xset xset-1.2.5
|
||||
fi
|
||||
|
||||
# really must be build via autoconf instead of meson, otherwise piglit wont find the test programs
|
||||
build_ac_xts xts https://gitlab.freedesktop.org/xorg/test/xts aae51229af810efba24412511f60602fab53eded
|
||||
|
||||
clone_source piglit https://gitlab.freedesktop.org/mesa/piglit 28d1349844eacda869f0f82f551bcd4ac0c4edfe
|
||||
|
||||
4
.github/scripts/util.sh
vendored
4
.github/scripts/util.sh
vendored
@ -79,13 +79,15 @@ build_ac_xts() {
|
||||
if [ -f $X11_PREFIX/$pkgname.DONE ]; then
|
||||
echo "package $pkgname already built"
|
||||
else
|
||||
echo "::group::Build XTS"
|
||||
clone_source "$pkgname" "$url" "$ref"
|
||||
(
|
||||
cd $pkgname
|
||||
CFLAGS='-fcommon'
|
||||
./autogen.sh --prefix=$X11_PREFIX CFLAGS="$CFLAGS"
|
||||
make -j${FDO_CI_CONCURRENT:-4} install
|
||||
xvfb-run make -j${FDO_CI_CONCURRENT:-4} install tetexec.cfg
|
||||
)
|
||||
touch $X11_PREFIX/$pkgname.DONE
|
||||
echo "::endgroup::"
|
||||
fi
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user