From f56ca186b28e0ce379b891883f585b8eff9a742c Mon Sep 17 00:00:00 2001 From: Dan McGregor Date: Fri, 23 Jan 2015 13:05:15 -0600 Subject: 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 Signed-off-by: Ross Burton --- meta/conf/distro/include/tcmode-default.inc | 2 +- meta/recipes-devtools/gcc/gcc-sanitizers.inc | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index 63a512d7ec..0e525a558a 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} \ -- cgit 1.2.3-korg