summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGert Wollny <[email protected]>2017-09-14 12:27:42 +0200
committerEmil Velikov <[email protected]>2017-09-15 13:56:28 +0100
commit39fe51c1e33e13dd1cc5c3ffb5b8a85da6fbce5c (patch)
tree04a90163bc5635aa79db14e454d7bcc2bb6eea0a
parentd3675812b53ae5583d693859c4973ccca9a9fb2e (diff)
travis: Add libunwind-dev to gallium/make builds
libunwind is a optional dependency used by the gallium aux module (libgallium) and consequently the final binaries must be linked against it. To test whether the library is properly specified in the link pass add it to the travis-ci build environment and force its use. Cc: [email protected] Reviewed-by: Eric Engestrom <[email protected]> Reviewed-by: Emil Velikov <[email protected]>
-rw-r--r--.travis.yml11
1 files changed, 11 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 4f7e0f5f1c8..51061d95318 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,6 +40,7 @@ matrix:
- GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
- GALLIUM_DRIVERS=""
- VULKAN_DRIVERS=""
+ - LIBUNWIND_FLAGS="--disable-libunwind"
addons:
apt:
packages:
@@ -66,6 +67,7 @@ matrix:
- GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
- GALLIUM_DRIVERS="swr"
- VULKAN_DRIVERS=""
+ - LIBUNWIND_FLAGS="--enable-libunwind"
addons:
apt:
sources:
@@ -81,6 +83,7 @@ matrix:
- libexpat1-dev
- libx11-xcb-dev
- libelf-dev
+ - libunwind8-dev
- env:
- LABEL="make Gallium Drivers Other"
- BUILD=make
@@ -93,6 +96,7 @@ matrix:
- GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
- GALLIUM_DRIVERS="i915,nouveau,pl111,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,etnaviv,imx"
- VULKAN_DRIVERS=""
+ - LIBUNWIND_FLAGS="--enable-libunwind"
addons:
apt:
sources:
@@ -108,6 +112,7 @@ matrix:
- libexpat1-dev
- libx11-xcb-dev
- libelf-dev
+ - libunwind8-dev
- env:
# NOTE: Analogous to SWR above, building Clover is quite slow.
- LABEL="make Gallium ST Clover"
@@ -125,6 +130,7 @@ matrix:
# Regardless - we're doing a quick build test here.
- GALLIUM_DRIVERS="i915"
- VULKAN_DRIVERS=""
+ - LIBUNWIND_FLAGS="--enable-libunwind"
addons:
apt:
sources:
@@ -144,6 +150,7 @@ matrix:
- libexpat1-dev
- libx11-xcb-dev
- libelf-dev
+ - libunwind8-dev
- env:
- LABEL="make Gallium ST Other"
- BUILD=make
@@ -159,6 +166,7 @@ matrix:
# Regardless - we're doing a quick build test here.
- GALLIUM_DRIVERS="i915,swrast"
- VULKAN_DRIVERS=""
+ - LIBUNWIND_FLAGS="--enable-libunwind"
addons:
apt:
packages:
@@ -178,6 +186,7 @@ matrix:
- libexpat1-dev
- libx11-xcb-dev
- libelf-dev
+ - libunwind8-dev
- env:
- LABEL="make Vulkan"
- BUILD=make
@@ -190,6 +199,7 @@ matrix:
- GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
- GALLIUM_DRIVERS=""
- VULKAN_DRIVERS="intel,radeon"
+ - LIBUNWIND_FLAGS="--disable-libunwind"
addons:
apt:
sources:
@@ -371,6 +381,7 @@ script:
export CC="$CC -isystem`pwd`";
./autogen.sh --enable-debug
+ $LIBUNWIND_FLAGS
$DRI_LOADERS
--with-dri-drivers=$DRI_DRIVERS
$GALLIUM_ST