mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 12:25:07 +00:00
ebeba052b5
MacOS build suddenly missing xvfb-run, which did work up until few hours ago. Therefore, make a quick workaround, until the situation is clearly resolved. The only impact is that some XTS tests (which are ignored on MacOS anyways) might not work properly. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
98 lines
2.1 KiB
Bash
98 lines
2.1 KiB
Bash
|
|
. .github/scripts/conf.sh
|
|
|
|
SOURCE_DIR=`pwd`
|
|
|
|
clone_source() {
|
|
local pkgname="$1"
|
|
local url="$2"
|
|
local ref="$3"
|
|
|
|
$SOURCE_DIR/.github/scripts/git-smart-checkout.sh \
|
|
--name "$pkgname" \
|
|
--url "$url" \
|
|
--ref "$ref"
|
|
}
|
|
|
|
build_meson() {
|
|
local pkgname="$1"
|
|
local url="$2"
|
|
local ref="$3"
|
|
shift
|
|
shift
|
|
shift || true
|
|
if [ -f $X11_PREFIX/$pkgname.DONE ]; then
|
|
echo "package $pkgname already built"
|
|
else
|
|
clone_source "$pkgname" "$url" "$ref"
|
|
(
|
|
cd $pkgname
|
|
meson "$@" build -Dprefix=$X11_PREFIX
|
|
ninja -j${FDO_CI_CONCURRENT:-4} -C build install
|
|
)
|
|
touch $X11_PREFIX/$pkgname.DONE
|
|
fi
|
|
}
|
|
|
|
build_ac() {
|
|
local pkgname="$1"
|
|
local url="$2"
|
|
local ref="$3"
|
|
shift
|
|
shift
|
|
shift || true
|
|
if [ -f $X11_PREFIX/$pkgname.DONE ]; then
|
|
echo "package $pkgname already built"
|
|
else
|
|
clone_source "$pkgname" "$url" "$ref"
|
|
(
|
|
cd $pkgname
|
|
./autogen.sh --prefix=$X11_PREFIX
|
|
make -j${FDO_CI_CONCURRENT:-4} install
|
|
)
|
|
touch $X11_PREFIX/$pkgname.DONE
|
|
fi
|
|
}
|
|
|
|
build_drv_ac() {
|
|
local pkgname="$1"
|
|
local url="$2"
|
|
local ref="$3"
|
|
shift
|
|
shift
|
|
shift || true
|
|
clone_source "$pkgname" "$url" "$ref"
|
|
(
|
|
cd $pkgname
|
|
./autogen.sh # --prefix=$X11_PREFIX
|
|
make -j${FDO_CI_CONCURRENT:-4} # install
|
|
)
|
|
}
|
|
|
|
build_ac_xts() {
|
|
local pkgname="$1"
|
|
local url="$2"
|
|
local ref="$3"
|
|
shift
|
|
shift
|
|
shift || true
|
|
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"
|
|
if [ "$X11_OS" = "Darwin" ]; then
|
|
make -j${FDO_CI_CONCURRENT:-4} install tetexec.cfg
|
|
else
|
|
xvfb-run make -j${FDO_CI_CONCURRENT:-4} install tetexec.cfg
|
|
fi
|
|
)
|
|
touch $X11_PREFIX/$pkgname.DONE
|
|
echo "::endgroup::"
|
|
fi
|
|
}
|