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-28 21:23:02 +0000 |
| commit | 4ed21998827060745d2858e2d6c121baf823e64a (patch) | |
| tree | 336ec40dd8449f6ca5b7e9f377277dfc2e72f00e | |
| parent | 822df6d23c9c24e131c38fda9f0012c47ad7af46 (diff) | |
| download | openembedded-core-4ed21998827060745d2858e2d6c121baf823e64a.tar.gz openembedded-core-4ed21998827060745d2858e2d6c121baf823e64a.tar.bz2 openembedded-core-4ed21998827060745d2858e2d6c121baf823e64a.zip | |
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
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -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}" PREFERRED_VERSION_gcc-sanitizers ?= "${GCCVERSION}" PREFERRED_VERSION_gcc-source ?= "${GCCVERSION}" PREFERRED_VERSION_nativesdk-gcc-runtime ?= "${SDKGCCVERSION}" -PREFERRED_VERSION_nativesdk-gcc-sanitizers ?= "${GCCVERSION}" +PREFERRED_VERSION_nativesdk-gcc-sanitizers ?= "${SDKGCCVERSION}" PREFERRED_VERSION_libgcc ?= "${GCCVERSION}" PREFERRED_VERSION_libgcc-initial ?= "${GCCVERSION}" 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 @@ require gcc-configure-common.inc +LICENSE = "NCSA | MIT" + +LIC_FILES_CHKSUM = "\ + file://libsanitizer/LICENSE.TXT;md5=0249c37748936faf5b1efd5789587909 \ +" + EXTRA_OECONF_PATHS = "\ --with-sysroot=/not/exist \ --with-build-sysroot=${STAGING_DIR_TARGET} \ |