diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-05-03 12:19:09 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-05-12 16:36:50 -0700 |
| commit | fbde5bf53c8bf2c3f7b1b99aa483e50dc6a97e99 (patch) | |
| tree | 58439342bc4434d1bd2dc6c56293c59110db6cf2 | |
| parent | 627e12a35c1cb9812088b220cf5397eca9843de8 (diff) | |
gitlab CI: install xorgproto from git before building the Xserver
Xserver git is now failing to build due to:
Dependency presentproto found: NO found 1.3 but need: '>= 1.4'
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/merge_requests/12>
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc2e7af..c266dbf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,11 +101,17 @@ build: # We don't want any failed commands to exit our script until VM # cleanup has been completed. - set +e - # First we need to build and install the Xorg server to get the SDK headers + # First we need to install the latest xorgproto needed to build Xserver + - | + /app/vmctl exec "git clone --depth=1 https://gitlab.freedesktop.org/xorg/proto/xorgproto.git" + /app/vmctl exec "mkdir xorgproto/_builddir" + /app/vmctl exec "cd xorgproto/_builddir && meson setup" + /app/vmctl exec "cd xorgproto/_builddir && ninja install" + # Then we need to build and install the Xorg server to get the SDK headers - | /app/vmctl exec "git clone --depth=1 https://gitlab.freedesktop.org/xorg/xserver.git" /app/vmctl exec "mkdir xserver/_builddir" - /app/vmctl exec "cd xserver/_builddir && meson setup $XSERVER_MESON_FLAGS" + /app/vmctl exec "cd xserver/_builddir && env PKG_CONFIG_PATH=/usr/local/lib/pkgconfig meson setup $XSERVER_MESON_FLAGS" /app/vmctl exec "cd xserver/_builddir && ninja" /app/vmctl exec "cd xserver/_builddir && ninja install" # Now build this driver |