Hi Dan, On 5 June 2018 at 23:06, Daniel Stone <dani...@collabora.com> wrote:
> + - apt-get -y --no-install-recommends install build-essential automake > autoconf libtool pkg-config libexpat1-dev libffi-dev libxml2-dev > libpixman-1-dev libpng-dev libjpeg-dev libcolord-dev mesa-common-dev > libglu1-mesa-dev libegl1-mesa-dev libgles2-mesa-dev libwayland-dev > libxcb1-dev libxcb-composite0-dev libxcb-xfixes0-dev libxcb-xkb-dev > libx11-xcb-dev libx11-dev libudev-dev libgbm-dev libxkbcommon-dev > libcairo2-dev libpango1.0-dev libgdk-pixbuf2.0-dev libxcursor-dev > libmtdev-dev libpam0g-dev libvpx-dev libsystemd-dev libinput-dev libwebp-dev > libjpeg-dev libva-dev liblcms2-dev git I think this can be simplify the explicit list to: apt-get -y --no-install-recommends build-dep wayland > + - mkdir -p /tmp/.X11-unix > + - chmod 777 /tmp/.X11-unix > + > +build-native: > + stage: build > + script: > + - git clone --depth=1 > git://anongit.freedesktop.org/git/wayland/wayland-protocols > + - export WAYLAND_PROTOCOLS_DIR="$(pwd)/prefix-wayland-protocols" > + - export > PKG_CONFIG_PATH="$WAYLAND_PROTOCOLS_DIR/share/pkgconfig:$PKG_CONFIG_PATH" > + - cd wayland-protocols > + - git show -s HEAD Is this needed? > + - mkdir build > + - cd build > + - ../autogen.sh --prefix="$WAYLAND_PROTOCOLS_DIR" > + - make install > + - cd ../../ > + - export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)" > + - export BUILD_ID="weston-$CI_JOB_NAME_$CI_COMMIT_SHA-$CI_JOB_ID" > + - export PREFIX="$(pwd)/prefix-$BUILD_ID" > + - export BUILDDIR="$(pwd)/build-$BUILD_ID" > + - mkdir "$BUILDDIR" "$PREFIX" Autotools creates $PREFIX for you. > + - make -j4 > + - make check > + - make install > + - make distcheck I was under the impression that "make -j4 distcheck" is enough and the four separate make calls are not needed? Alternatively it's worth setting MAKEFLAGS="-jX" once so it's used across all. Note the artefacts regex would need a tweak if only distcheck is used. HTH Emil _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/wayland-devel
