aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhou Hao <haox.a.zhou@intel.com>2019-07-15 18:37:51 +0800
committerPhilip Li <philip.li@intel.com>2019-07-15 22:11:48 +0800
commit24853a901d446aa7629804350d0d999e564e8a29 (patch)
treebcaae78a81e4bb87b2ceea57a3a638a61d9f2230
parent3bc26c81ef80557d952c68f315ebade1f5c12104 (diff)
downloadlkp-tests-24853a901d446aa7629804350d0d999e564e8a29.tar.gz
pack/piglit: fix gcc9 compilation error
When using gcc9 for the compilation of piglit, the following error occurs: ``` /tmp/build-piglit/piglit/tests/texturing/tex-upside-down-miptree.c: In function ‘setup_texture’: /tmp/build-piglit/piglit/tests/texturing/tex-upside-down-miptree.c:130:1: internal compiler error: in fold_convert_loc, at fold-const.c:2429 130 | setup_texture(void) | ^~~~~~~~~~~~~ Please submit a full bug report, with preprocessed source if appropriate. See <https://gcc.gnu.org/bugs/> for instructions. make[2]: *** [target_api/gl/tests/texturing/CMakeFiles/tex-upside-down-miptree.dir/build.make:63: target_api/gl/tests/texturing/CMakeFiles/tex-upside-down-miptree.dir/tex-upside-down-miptree.c.o] Error 1 make[1]: *** [CMakeFiles/Makefile2:26732: target_api/gl/tests/texturing/CMakeFiles/tex-upside-down-miptree.dir/all] Error 2 make: *** [Makefile:152: all] Error 2 Making piglit-LKP failed ``` This is a bug in the gcc9 compiler. To avoid this problem, use gcc7 to compile. Signed-off-by: Zhou Hao <haox.a.zhou@intel.com> Signed-off-by: Philip Li <philip.li@intel.com>
-rw-r--r--distro/adaptation/clear1
-rw-r--r--distro/depends/piglit-dev1
-rwxr-xr-xpack/piglit5
3 files changed, 7 insertions, 0 deletions
diff --git a/distro/adaptation/clear b/distro/adaptation/clear
index dea2edc3..1efda99d 100644
--- a/distro/adaptation/clear
+++ b/distro/adaptation/clear
@@ -87,6 +87,7 @@ ganglia-monitor:
gawk: os-core
gcc-6: c-basic
gcc-6-multilib: dev-utils-dev
+gcc-7: c-extras-gcc7
gcc: c-basic
gcc-multilib: dev-utils-dev
gdb: gdb
diff --git a/distro/depends/piglit-dev b/distro/depends/piglit-dev
index bf442692..d8093c7f 100644
--- a/distro/depends/piglit-dev
+++ b/distro/depends/piglit-dev
@@ -39,3 +39,4 @@ libdrm-amdgpu1
libc6/unstable
libc6-dev/unstable
libc-bin/unstable
+gcc-7
diff --git a/pack/piglit b/pack/piglit
index 1af94e4c..513b0f4c 100755
--- a/pack/piglit
+++ b/pack/piglit
@@ -22,6 +22,11 @@ build()
local ncpu=$(nproc)
local wayland=1
+ gcc_major=$(gcc -dumpversion | cut -d. -f1)
+
+ if [ "$gcc_major" -ge 8 ]; then
+ export CC=$(which gcc7)
+ fi
[ "$distro" = "centos" ] && wayland=0
cd ../waffle || return