From: Eric Engestrom Date: Mon, 28 Jan 2019 21:36:08 +0000 (+0000) Subject: travis: remove unused linux code path X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=087af992a276e7478c9c84552e18c07ddb942e9d;p=mesa.git travis: remove unused linux code path Signed-off-by: Eric Engestrom --- diff --git a/.travis.yml b/.travis.yml index 7a684e37d00..2f0b6edece1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,32 +3,8 @@ language: c dist: xenial cache: - apt: true ccache: true -env: - global: - - 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.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 - - LIBVA_VERSION=libva-1.7.0 - - LIBWAYLAND_VERSION=wayland-1.15.0 - - WAYLAND_PROTOCOLS_VERSION=wayland-protocols-1.8 - - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig:$HOME/prefix/share/pkgconfig - - LD_LIBRARY_PATH="$HOME/prefix/lib:$LD_LIBRARY_PATH" - - PATH="$HOME/prefix/bin:$PATH" - matrix: include: - env: @@ -91,105 +67,6 @@ install: # Install dependencies where we require specific versions (or where # disallowed by Travis CI's package whitelisting). - - | - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - wget $XORG_RELEASES/util/$XORGMACROS_VERSION.tar.bz2 - tar -jxvf $XORGMACROS_VERSION.tar.bz2 - (cd $XORGMACROS_VERSION && ./configure --prefix=$HOME/prefix && make install) - - wget $XORG_RELEASES/proto/$GLPROTO_VERSION.tar.bz2 - tar -jxvf $GLPROTO_VERSION.tar.bz2 - (cd $GLPROTO_VERSION && ./configure --prefix=$HOME/prefix && make install) - - wget $XORG_RELEASES/proto/$DRI2PROTO_VERSION.tar.bz2 - tar -jxvf $DRI2PROTO_VERSION.tar.bz2 - (cd $DRI2PROTO_VERSION && ./configure --prefix=$HOME/prefix && make install) - - wget $XCB_RELEASES/$XCBPROTO_VERSION.tar.bz2 - tar -jxvf $XCBPROTO_VERSION.tar.bz2 - (cd $XCBPROTO_VERSION && ./configure --prefix=$HOME/prefix && make install) - - wget $XCB_RELEASES/$LIBXCB_VERSION.tar.bz2 - tar -jxvf $LIBXCB_VERSION.tar.bz2 - (cd $LIBXCB_VERSION && ./configure --prefix=$HOME/prefix && make install) - - wget $XORG_RELEASES/lib/$LIBPCIACCESS_VERSION.tar.bz2 - tar -jxvf $LIBPCIACCESS_VERSION.tar.bz2 - (cd $LIBPCIACCESS_VERSION && ./configure --prefix=$HOME/prefix && make install) - - 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 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 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) - - wget $WAYLAND_RELEASES/$LIBWAYLAND_VERSION.tar.xz - tar -axvf $LIBWAYLAND_VERSION.tar.xz - (cd $LIBWAYLAND_VERSION && ./configure --prefix=$HOME/prefix --enable-libraries --without-host-scanner --disable-documentation --disable-dtd-validation && make install) - - wget $WAYLAND_RELEASES/$WAYLAND_PROTOCOLS_VERSION.tar.xz - tar -axvf $WAYLAND_PROTOCOLS_VERSION.tar.xz - (cd $WAYLAND_PROTOCOLS_VERSION && ./configure --prefix=$HOME/prefix && make install) - - # 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/ - - # Generate this header since one is missing on the Travis instance - mkdir -p linux - printf "%s\n" \ - "#ifndef _LINUX_MEMFD_H" \ - "#define _LINUX_MEMFD_H" \ - "" \ - "#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 export CFLAGS="$CFLAGS -isystem`pwd`";