X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.travis.yml;h=82c2088776c9915710530f5912ee7d1c925d7789;hb=0d6dea0ac87ec3ca089c4ab637fd07a2f488e6a1;hp=ae28e63efb866ed28bf71dd9738e4f9efb0bb322;hpb=61edad216ea113b1bb9f97c696af1e4a40fbb9ac;p=mesa.git diff --git a/.travis.yml b/.travis.yml index ae28e63efb8..82c2088776c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: c -sudo: false -dist: trusty +dist: xenial cache: apt: true @@ -9,15 +8,17 @@ cache: env: global: - - XORG_RELEASES=http://xorg.freedesktop.org/releases/individual - - XCB_RELEASES=http://xcb.freedesktop.org/dist - - WAYLAND_RELEASES=http://wayland.freedesktop.org/releases + - XORG_RELEASES=https://xorg.freedesktop.org/releases/individual + - XCB_RELEASES=https://xcb.freedesktop.org/dist + - WAYLAND_RELEASES=https://wayland.freedesktop.org/releases - XORGMACROS_VERSION=util-macros-1.19.0 - GLPROTO_VERSION=glproto-1.4.17 - DRI2PROTO_VERSION=dri2proto-2.8 - LIBPCIACCESS_VERSION=libpciaccess-0.13.4 - - LIBDRM_VERSION=libdrm-2.4.74 + - LIBDRM_VERSION=libdrm-2.4.97 - XCBPROTO_VERSION=xcb-proto-1.13 + - RANDRPROTO_VERSION=randrproto-1.3.0 + - LIBXRANDR_VERSION=libXrandr-1.3.0 - LIBXCB_VERSION=libxcb-1.13 - LIBXSHMFENCE_VERSION=libxshmfence-1.2 - LIBVDPAU_VERSION=libvdpau-1.1 @@ -31,39 +32,33 @@ env: matrix: include: - env: - - LABEL="meson Vulkan" - - BUILD=meson - - MESON_OPTIONS="-Ddri-drivers=[] -Dgallium-drivers=[]" - - LLVM_VERSION=5.0 + - LABEL="make Vulkan" + - BUILD=make + - MAKEFLAGS="-j4" + - MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check" + - LLVM_VERSION=7 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" + - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland" + - DRI_DRIVERS="" + - GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" + - GALLIUM_DRIVERS="" + - VULKAN_DRIVERS="intel,radeon" + - LIBUNWIND_FLAGS="--disable-libunwind" addons: apt: sources: - - llvm-toolchain-trusty-5.0 + - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main' + key_url: https://apt.llvm.org/llvm-snapshot.gpg.key packages: - # LLVM packaging is broken and misses these dependencies - - libedit-dev # From sources above - - llvm-5.0-dev + - llvm-7-dev # Common - xz-utils - libexpat1-dev - - libelf-dev - - python3-pip - - env: - - LABEL="meson loaders/classic DRI" - - BUILD=meson - - MESON_OPTIONS="-Dvulkan-drivers=[] -Dgallium-drivers=[]" - addons: - apt: - packages: - - xz-utils - - x11proto-xf86vidmode-dev - - libexpat1-dev - libx11-xcb-dev - - libxdamage-dev - - libxfixes-dev + - libelf-dev - python3-pip + - python3-setuptools - env: - LABEL="make loaders/classic DRI" - BUILD=make @@ -80,10 +75,13 @@ matrix: packages: - xz-utils - x11proto-xf86vidmode-dev + - libxxf86vm-dev - libexpat1-dev - libx11-xcb-dev - libxdamage-dev - libxfixes-dev + - python3-pip + - python3-setuptools - env: # NOTE: Building SWR is 2x (yes two) times slower than all the other # gallium drivers combined. @@ -92,10 +90,8 @@ matrix: - BUILD=make - MAKEFLAGS="-j4" - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=4.0 + - LLVM_VERSION=6.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - OVERRIDE_CC="gcc-4.8" - - OVERRIDE_CXX="g++-4.8" - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_DRIVERS="" - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" @@ -104,26 +100,22 @@ matrix: - LIBUNWIND_FLAGS="--enable-libunwind" addons: apt: - sources: - - llvm-toolchain-trusty-4.0 packages: - # LLVM packaging is broken and misses these dependencies - - libedit-dev - # From sources above - - llvm-4.0-dev + - llvm-6.0-dev # Common - xz-utils - - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev + - python3-pip + - python3-setuptools - env: - LABEL="make Gallium Drivers RadeonSI" - BUILD=make - MAKEFLAGS="-j4" - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=5.0 + - LLVM_VERSION=7 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_DRIVERS="" @@ -134,19 +126,19 @@ matrix: addons: apt: sources: - - llvm-toolchain-trusty-5.0 + - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main' + key_url: https://apt.llvm.org/llvm-snapshot.gpg.key packages: - # LLVM packaging is broken and misses these dependencies - - libedit-dev # From sources above - - llvm-5.0-dev + - llvm-7-dev # Common - xz-utils - - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev + - python3-pip + - python3-setuptools - env: - LABEL="make Gallium Drivers Other" - BUILD=make @@ -154,43 +146,33 @@ matrix: - MAKE_CHECK_COMMAND="true" - LLVM_VERSION=3.9 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - # New binutils linker is required for llvm-3.9 - - OVERRIDE_PATH=/usr/lib/binutils-2.26/bin - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_DRIVERS="" - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - - GALLIUM_DRIVERS="i915,nouveau,pl111,r300,r600,freedreno,svga,swrast,vc4,virgl,etnaviv,imx" + - GALLIUM_DRIVERS="i915,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv" - VULKAN_DRIVERS="" - LIBUNWIND_FLAGS="--enable-libunwind" addons: apt: - sources: - - llvm-toolchain-trusty-3.9 packages: - - binutils-2.26 # LLVM packaging is broken and misses these dependencies - libedit-dev - # From sources above - llvm-3.9-dev # Common - xz-utils - - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev + - python3-pip + - python3-setuptools - env: - # NOTE: Analogous to SWR above, building Clover is quite slow. - LABEL="make Gallium ST Clover LLVM-3.9" - BUILD=make - MAKEFLAGS="-j4" - MAKE_CHECK_COMMAND="true" - LLVM_VERSION=3.9 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - OVERRIDE_CC=gcc-4.7 - - OVERRIDE_CXX=g++-4.7 - # New binutils linker is required for llvm-3.9 - - OVERRIDE_PATH=/usr/lib/binutils-2.26/bin - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_DRIVERS="" - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" @@ -199,35 +181,28 @@ matrix: - LIBUNWIND_FLAGS="--enable-libunwind" addons: apt: - sources: - - llvm-toolchain-trusty-3.9 packages: - - binutils-2.26 - libclc-dev # LLVM packaging is broken and misses these dependencies - libedit-dev - - g++-4.7 - # From sources above - llvm-3.9-dev - clang-3.9 - libclang-3.9-dev # Common - xz-utils - - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev + - python3-pip + - python3-setuptools - env: - # NOTE: Analogous to SWR above, building Clover is quite slow. - LABEL="make Gallium ST Clover LLVM-4.0" - BUILD=make - MAKEFLAGS="-j4" - MAKE_CHECK_COMMAND="true" - LLVM_VERSION=4.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - OVERRIDE_CC=gcc-4.8 - - OVERRIDE_CXX=g++-4.8 - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_DRIVERS="" - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" @@ -236,62 +211,52 @@ matrix: - LIBUNWIND_FLAGS="--enable-libunwind" addons: apt: - sources: - - llvm-toolchain-trusty-4.0 packages: - libclc-dev # LLVM packaging is broken and misses these dependencies - libedit-dev - - g++-4.8 - # From sources above - llvm-4.0-dev - clang-4.0 - libclang-4.0-dev # Common - xz-utils - - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev + - python3-pip + - python3-setuptools - env: - # NOTE: Analogous to SWR above, building Clover is quite slow. - LABEL="make Gallium ST Clover LLVM-5.0" - BUILD=make - MAKEFLAGS="-j4" - MAKE_CHECK_COMMAND="true" - LLVM_VERSION=5.0 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - OVERRIDE_CC=gcc-4.8 - - OVERRIDE_CXX=g++-4.8 - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_DRIVERS="" - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - - GALLIUM_DRIVERS="r600,radeonsi" + - GALLIUM_DRIVERS="r600" - VULKAN_DRIVERS="" - LIBUNWIND_FLAGS="--enable-libunwind" addons: apt: - sources: - - llvm-toolchain-trusty-5.0 packages: - libclc-dev # LLVM packaging is broken and misses these dependencies - libedit-dev - - g++-4.8 - # From sources above - llvm-5.0-dev - clang-5.0 - libclang-5.0-dev # Common - xz-utils - - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev + - python3-pip + - python3-setuptools - env: - # NOTE: Analogous to SWR above, building Clover is quite slow. - LABEL="make Gallium ST Clover LLVM-6.0" - BUILD=make - MAKEFLAGS="-j4" @@ -301,170 +266,101 @@ matrix: - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_DRIVERS="" - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - - GALLIUM_DRIVERS="r600,radeonsi" + - GALLIUM_DRIVERS="r600" - VULKAN_DRIVERS="" - LIBUNWIND_FLAGS="--enable-libunwind" addons: apt: - sources: - - llvm-toolchain-trusty-6.0 - # llvm-6 depends on gcc-4.9 which is not in main repo - - ubuntu-toolchain-r-test packages: - libclc-dev - # From sources above - llvm-6.0-dev - clang-6.0 - libclang-6.0-dev # Common - xz-utils - - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev + - python3-pip + - python3-setuptools - env: - - LABEL="make Gallium ST Other" + - LABEL="make Gallium ST Clover LLVM-7" - BUILD=make - MAKEFLAGS="-j4" - MAKE_CHECK_COMMAND="true" - - LLVM_VERSION=3.3 + - LLVM_VERSION=7 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_DRIVERS="" - - GALLIUM_ST="--enable-dri --disable-opencl --enable-xa --enable-nine --enable-xvmc --enable-vdpau --enable-va --enable-omx-bellagio --enable-gallium-osmesa" - # We need swrast for osmesa and nine. - # i915 most likely doesn't work with most ST. - # Regardless - we're doing a quick build test here. - - GALLIUM_DRIVERS="i915,swrast" + - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" + - GALLIUM_DRIVERS="r600,radeonsi" - VULKAN_DRIVERS="" - LIBUNWIND_FLAGS="--enable-libunwind" addons: apt: + sources: + - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main' + key_url: https://apt.llvm.org/llvm-snapshot.gpg.key packages: - # We actually want to test against llvm-3.3 - - llvm-3.3-dev - # Nine requires gcc 4.6... which is the one we have right ? - - libxvmc-dev - # Build locally, for now. - #- libvdpau-dev - #- libva-dev - - libomxil-bellagio-dev - # LLVM packaging is broken and misses these dependencies - - libedit-dev + - libclc-dev + # From sources above + - llvm-7-dev + - clang-7 + - libclang-7-dev # Common - xz-utils - - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev - libunwind8-dev - env: - - LABEL="make Vulkan" + - LABEL="make Gallium ST Other" - BUILD=make - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check" - - LLVM_VERSION=5.0 + - MAKE_CHECK_COMMAND="true" + - LLVM_VERSION=3.5 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland" + - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl" - DRI_DRIVERS="" - - GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa" - - GALLIUM_DRIVERS="" - - VULKAN_DRIVERS="intel,radeon" - - LIBUNWIND_FLAGS="--disable-libunwind" - addons: - apt: - sources: - - llvm-toolchain-trusty-5.0 - packages: - # LLVM packaging is broken and misses these dependencies - - libedit-dev - # From sources above - - llvm-5.0-dev - # Common - - xz-utils - - x11proto-xf86vidmode-dev - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - env: - - LABEL="scons" - - BUILD=scons - - SCONSFLAGS="-j4" - # Explicitly disable. - - SCONS_TARGET="llvm=0" - # Keep it symmetrical to the make build. - - SCONS_CHECK_COMMAND="scons llvm=0 check" - addons: - apt: - packages: - - scons - # Common - - xz-utils - - x11proto-xf86vidmode-dev - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - env: - - LABEL="scons LLVM" - - BUILD=scons - - SCONSFLAGS="-j4" - - SCONS_TARGET="llvm=1" - # Keep it symmetrical to the make build. - - SCONS_CHECK_COMMAND="scons llvm=1 check" - - LLVM_VERSION=3.3 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - addons: - apt: - packages: - - scons - # LLVM packaging is broken and misses these dependencies - - libedit-dev - - llvm-3.3-dev - # Common - - xz-utils - - x11proto-xf86vidmode-dev - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - env: - - LABEL="scons SWR" - - BUILD=scons - - SCONSFLAGS="-j4" - - SCONS_TARGET="swr=1" - - LLVM_VERSION=4.0 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - # Keep it symmetrical to the make build. There's no actual SWR, yet. - - SCONS_CHECK_COMMAND="true" - - OVERRIDE_CC="gcc-4.8" - - OVERRIDE_CXX="g++-4.8" + - GALLIUM_ST="--enable-dri --disable-opencl --enable-xa --enable-nine --enable-xvmc --enable-vdpau --enable-va --enable-omx-bellagio --enable-gallium-osmesa" + # We need swrast for osmesa and nine. + # i915 most likely doesn't work with most ST. + # Regardless - we're doing a quick build test here. + - GALLIUM_DRIVERS="i915,swrast" + - VULKAN_DRIVERS="" + - LIBUNWIND_FLAGS="--enable-libunwind" addons: apt: - sources: - - llvm-toolchain-trusty-4.0 packages: - - scons + # We actually want to test against llvm-3.3, yet 3.5 is available + - llvm-3.5-dev + # Nine requires gcc 4.6... which is the one we have right ? + - libxvmc-dev + # Build locally, for now. + #- libvdpau-dev + #- libva-dev + - libomxil-bellagio-dev # LLVM packaging is broken and misses these dependencies - libedit-dev - # From sources above - - llvm-4.0-dev # Common - xz-utils - - x11proto-xf86vidmode-dev - libexpat1-dev - libx11-xcb-dev - libelf-dev + - libunwind8-dev + - python3-pip + - python3-setuptools - env: - LABEL="macOS make" - BUILD=make - - MAKEFLAGS="-j4" - - MAKE_CHECK_COMMAND="make check" - DRI_LOADERS="--with-platforms=x11 --disable-egl" os: osx - env: - LABEL="macOS meson" - BUILD=meson - - MESON_OPTIONS="-Degl=false" + - DRI_LOADERS="-Dplatforms=x11" + - GALLIUM_DRIVERS=swrast os: osx before_install: @@ -491,24 +387,17 @@ before_install: fi install: - - pip2 install --user mako - # Install a more modern meson from pip, since the version in the - # ubuntu repos is often quite old. Avoid >=0.45.0 as it needs python - # 3.5+ + # ubuntu repos is often quite old. - if test "x$BUILD" = xmeson; then - pip3 install --user "meson<0.45.0"; + pip3 install --user meson; + pip3 install --user mako; fi - # Since libdrm gets updated in configure.ac regularly, try to pick up the - # latest version from there. - - for line in `grep "^LIBDRM.*_REQUIRED=" configure.ac`; do - old_ver=`echo $LIBDRM_VERSION | sed 's/libdrm-//'`; - new_ver=`echo $line | sed 's/.*REQUIRED=//'`; - if `echo "$old_ver,$new_ver" | tr ',' '\n' | sort -Vc 2> /dev/null`; then - export LIBDRM_VERSION="libdrm-$new_ver"; - fi; - done + # Install autotools build dependencies + - if test "x$BUILD" = xmake; then + pip2 install --user mako; + fi # Install dependencies where we require specific versions (or where # disallowed by Travis CI's package whitelisting). @@ -539,19 +428,27 @@ install: tar -jxvf $LIBPCIACCESS_VERSION.tar.bz2 (cd $LIBPCIACCESS_VERSION && ./configure --prefix=$HOME/prefix && make install) - wget http://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2 + wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2 tar -jxvf $LIBDRM_VERSION.tar.bz2 (cd $LIBDRM_VERSION && ./configure --prefix=$HOME/prefix --enable-vc4 --enable-freedreno --enable-etnaviv-experimental-api && make install) + wget $XORG_RELEASES/proto/$RANDRPROTO_VERSION.tar.bz2 + tar -jxvf $RANDRPROTO_VERSION.tar.bz2 + (cd $RANDRPROTO_VERSION && ./configure --prefix=$HOME/prefix && make install) + + wget $XORG_RELEASES/lib/$LIBXRANDR_VERSION.tar.bz2 + tar -jxvf $LIBXRANDR_VERSION.tar.bz2 + (cd $LIBXRANDR_VERSION && ./configure --prefix=$HOME/prefix && make install) + wget $XORG_RELEASES/lib/$LIBXSHMFENCE_VERSION.tar.bz2 tar -jxvf $LIBXSHMFENCE_VERSION.tar.bz2 (cd $LIBXSHMFENCE_VERSION && ./configure --prefix=$HOME/prefix && make install) - wget http://people.freedesktop.org/~aplattner/vdpau/$LIBVDPAU_VERSION.tar.bz2 + wget https://people.freedesktop.org/~aplattner/vdpau/$LIBVDPAU_VERSION.tar.bz2 tar -jxvf $LIBVDPAU_VERSION.tar.bz2 (cd $LIBVDPAU_VERSION && ./configure --prefix=$HOME/prefix && make install) - wget http://www.freedesktop.org/software/vaapi/releases/libva/$LIBVA_VERSION.tar.bz2 + wget https://www.freedesktop.org/software/vaapi/releases/libva/$LIBVA_VERSION.tar.bz2 tar -jxvf $LIBVA_VERSION.tar.bz2 (cd $LIBVA_VERSION && ./configure --prefix=$HOME/prefix --disable-wayland --disable-dummy-driver && make install) @@ -563,7 +460,7 @@ install: tar -axvf $WAYLAND_PROTOCOLS_VERSION.tar.xz (cd $WAYLAND_PROTOCOLS_VERSION && ./configure --prefix=$HOME/prefix && make install) - # Meson requires ninja >= 1.6, but trusty has 1.3.x + # Meson requires ninja >= 1.6, but xenial has 1.3.x wget https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-linux.zip unzip ninja-linux.zip mv ninja $HOME/prefix/bin/ @@ -574,24 +471,46 @@ install: "#ifndef _LINUX_MEMFD_H" \ "#define _LINUX_MEMFD_H" \ "" \ - "#define __NR_memfd_create 319" \ - "#define SYS_memfd_create __NR_memfd_create" \ - "" \ "#define MFD_CLOEXEC 0x0001U" \ "#define MFD_ALLOW_SEALING 0x0002U" \ "" \ "#endif /* _LINUX_MEMFD_H */" > linux/memfd.h + + # Generate this header, including the missing SYS_memfd_create + # macro, which is not provided by the header in the Travis + # instance + mkdir -p sys + printf "%s\n" \ + "#ifndef _SYSCALL_H" \ + "#define _SYSCALL_H 1" \ + "" \ + "#include " \ + "" \ + "#ifndef _LIBC" \ + "# include " \ + "#endif" \ + "" \ + "#ifndef __NR_memfd_create" \ + "# define __NR_memfd_create 319 /* Taken from */" \ + "#endif" \ + "" \ + "#ifndef SYS_memfd_create" \ + "# define SYS_memfd_create __NR_memfd_create" \ + "#endif" \ + "" \ + "#endif" > sys/syscall.h fi script: - if test "x$BUILD" = xmake; then - test -n "$OVERRIDE_CC" && export CC="$OVERRIDE_CC"; - test -n "$OVERRIDE_CXX" && export CXX="$OVERRIDE_CXX"; - test -n "$OVERRIDE_PATH" && export PATH="$OVERRIDE_PATH:$PATH"; - export CFLAGS="$CFLAGS -isystem`pwd`"; + export MAKEFLAGS="-j4"; - ./autogen.sh --enable-debug + mkdir build && + cd build && + ../autogen.sh + --enable-autotools + --enable-debug $LIBUNWIND_FLAGS $DRI_LOADERS --with-dri-drivers=$DRI_DRIVERS @@ -603,34 +522,28 @@ script: make && eval $MAKE_CHECK_COMMAND; fi - - if test "x$BUILD" = xscons; then - test -n "$OVERRIDE_CC" && export CC="$OVERRIDE_CC"; - test -n "$OVERRIDE_CXX" && export CXX="$OVERRIDE_CXX"; - scons $SCONS_TARGET && eval $SCONS_CHECK_COMMAND; - fi - - | if test "x$BUILD" = xmeson; then + if test -n "$LLVM_CONFIG"; then + # We need to control the version of llvm-config we're using, so we'll + # generate a native file to do so. This requires meson >=0.49 + # + echo -e "[binaries]\nllvm-config = '`which $LLVM_CONFIG`'" > native.file - # Travis CI has moved to LLVM 5.0, and meson is detecting - # automatically the available version in /usr/local/bin based on - # the PATH env variable order preference. - # - # As for 0.44.x, Meson cannot receive the path to the - # llvm-config binary as a configuration parameter. See - # https://github.com/mesonbuild/meson/issues/2887 and - # https://github.com/dcbaker/meson/commit/7c8b6ee3fa42f43c9ac7dcacc61a77eca3f1bcef - # - # We want to use the custom (APT) installed version. Therefore, - # let's make Meson find our wanted version sooner than the one - # at /usr/local/bin - # - # Once this is corrected, we would still need a patch similar - # to: - # https://lists.freedesktop.org/archives/mesa-dev/2017-December/180217.html - test -f /usr/bin/$LLVM_CONFIG && ln -s /usr/bin/$LLVM_CONFIG $HOME/prefix/bin/llvm-config + $LLVM_CONFIG --version + else + : > native.file + fi export CFLAGS="$CFLAGS -isystem`pwd`" - meson _build $MESON_OPTIONS + meson _build \ + --native-file=native.file \ + -Dbuild-tests=true \ + ${DRI_LOADERS} \ + -Ddri-drivers=${DRI_DRIVERS:-[]} \ + -Dgallium-drivers=${GALLIUM_DRIVERS:-[]} \ + -Dvulkan-drivers=${VULKAN_DRIVERS:-[]} + meson configure _build ninja -C _build + ninja -C _build test fi