diff options
author | Dan McGregor <dan.mcgregor@usask.ca> | 2015-01-23 13:05:15 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-29 15:36:49 +0000 |
commit | 6a41dd1bd1dcf7cc3229a3f83fcd3f0554fcbb6c (patch) | |
tree | 48c62b6a731eb9fa2d1810e35fe7713452262190 | |
parent | b2b62c3608b424cfc3e83bca372d508c55e42038 (diff) | |
download | poky-6a41dd1bd1dcf7cc3229a3f83fcd3f0554fcbb6c.tar.gz |
gcc-sanitizers: fix licensing
The sanitizer runtime library is dual-licensed under the NCSA
and MIT licenses.
Also make nativesdk-gcc-sanitizers use SDKGCCVERSION by default
instead of GCCVERSION
(From OE-Core rev: 4ed21998827060745d2858e2d6c121baf823e64a)
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/distro/include/tcmode-default.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-sanitizers.inc | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index ae6aaf3c5d..7428aa99ff 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc | |||
@@ -39,7 +39,7 @@ PREFERRED_VERSION_gcc-runtime ?= "${GCCVERSION}" | |||
39 | PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}" | 39 | PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}" |
40 | PREFERRED_VERSION_gcc-source ?= "${GCCVERSION}" | 40 | PREFERRED_VERSION_gcc-source ?= "${GCCVERSION}" |
41 | PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" | 41 | PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" |
42 | PREFERRED_VERSION_nativesdk-gcc-sanitizers ?= "${GCCVERSION}" | 42 | PREFERRED_VERSION_nativesdk-gcc-sanitizers ?= "${SDKGCCVERSION}" |
43 | PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" | 43 | PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" |
44 | PREFERRED_VERSION_libgcc-initial ?= "${GCCVERSION}" | 44 | PREFERRED_VERSION_libgcc-initial ?= "${GCCVERSION}" |
45 | PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}" | 45 | PREFERRED_VERSION_nativesdk-libgcc ?= "${SDKGCCVERSION}" |
diff --git a/meta/recipes-devtools/gcc/gcc-sanitizers.inc b/meta/recipes-devtools/gcc/gcc-sanitizers.inc index 892dfe0476..35c9247cc1 100644 --- a/meta/recipes-devtools/gcc/gcc-sanitizers.inc +++ b/meta/recipes-devtools/gcc/gcc-sanitizers.inc | |||
@@ -1,5 +1,11 @@ | |||
1 | require gcc-configure-common.inc | 1 | require gcc-configure-common.inc |
2 | 2 | ||
3 | LICENSE = "NCSA | MIT" | ||
4 | |||
5 | LIC_FILES_CHKSUM = "\ | ||
6 | file://libsanitizer/LICENSE.TXT;md5=0249c37748936faf5b1efd5789587909 \ | ||
7 | " | ||
8 | |||
3 | EXTRA_OECONF_PATHS = "\ | 9 | EXTRA_OECONF_PATHS = "\ |
4 | --with-sysroot=/not/exist \ | 10 | --with-sysroot=/not/exist \ |
5 | --with-build-sysroot=${STAGING_DIR_TARGET} \ | 11 | --with-build-sysroot=${STAGING_DIR_TARGET} \ |