[oe-commits] Dan McGregor : gcc-sanitizers: fix licensing

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 4ed21998827060745d2858e2d6c121baf823e64a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4ed21998827060745d2858e2d6c121baf823e64a

Author: Dan McGregor <dan.mcgregor at usask.ca>
Date:   Fri Jan 23 13:05:15 2015 -0600

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 at usask.ca>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 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 ae6aaf3..7428aa9 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 892dfe0..35c9247 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} \