diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2018-09-07 13:08:31 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2018-09-07 13:13:17 +0200 |
| commit | 721e4cbb529d247c9c1ebef68275e70a3086ae0b (patch) | |
| tree | 2967ef4e10e2592661f664df4515d67dbc80cfe5 /package/libva-intel-driver/0001-check-ssp.patch | |
| parent | 89920e9735cb561dccf1e1f81d35788fd10a655b (diff) | |
| parent | cec266ee1f708f11cc679cb4f81613fa4186003c (diff) | |
| download | buildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.tar.gz buildroot-721e4cbb529d247c9c1ebef68275e70a3086ae0b.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/libva-intel-driver/0001-check-ssp.patch')
| -rw-r--r-- | package/libva-intel-driver/0001-check-ssp.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/package/libva-intel-driver/0001-check-ssp.patch b/package/libva-intel-driver/0001-check-ssp.patch new file mode 100644 index 0000000000..c801ed3148 --- /dev/null +++ b/package/libva-intel-driver/0001-check-ssp.patch @@ -0,0 +1,65 @@ +From bf08643583520b763150af9ed20166b7fe272fd5 Mon Sep 17 00:00:00 2001 +From: Bernd Kuhls <bernd.kuhls@t-online.de> +Date: Sun, 29 Jul 2018 20:55:23 +0200 +Subject: [PATCH] Check for -fstack-protector + +Not all toolchains provide support for -fstack-protector. This patch +provides a configure check to avoid build errors like + +/home/buildroot/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/6.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp_nonshared +/home/buildroot/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/6.4.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: cannot find -lssp + +Patch sent upstream as PR 408. + +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> +--- + configure.ac | 17 +++++++++++++++++ + src/Makefile.am | 5 ++++- + 2 files changed, 21 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c76060c7..5471aee7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -86,6 +86,23 @@ AC_SEARCH_LIBS([dlopen], [dl], [], [ + AC_MSG_ERROR([unable to find the dlopen() function]) + ]) + ++ ++# Check for -fstack-protector ++ssp_cc=yes ++if test "X$CC-cc" != "X"; then ++ AC_MSG_CHECKING([whether ${CC-cc} accepts -fstack-protector]) ++ ssp_old_cflags="$CFLAGS" ++ CFLAGS="$CFLAGS -fstack-protector" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[alloca(100);]])], [], [ssp_cc=no]) ++ AC_MSG_RESULT([$ssp_cc]) ++ if test "X$ssp_cc" = "Xno"; then ++ CFLAGS="$ssp_old_cflags" ++ else ++ AC_DEFINE([ENABLE_SSP_CC], 1, [Define if SSP C support is enabled.]) ++ fi ++fi ++AM_CONDITIONAL(USE_SSP, test "$ssp_cc" = "yes") ++ + dnl Check for recent enough DRM + LIBDRM_VERSION=libdrm_version + PKG_CHECK_MODULES([DRM], [libdrm >= $LIBDRM_VERSION libdrm_intel]) +diff --git a/src/Makefile.am b/src/Makefile.am +index c26293dd..5c52658a 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -35,9 +35,12 @@ AM_CPPFLAGS = \ + driver_cflags = \ + -Wall \ + -fvisibility=hidden \ +- -fstack-protector \ + $(NULL) + ++if USE_SSP ++driver_cflags += -fstack-protector ++endif ++ + driver_ldflags = \ + -avoid-version \ + -no-undefined \ |
