From ef90ed7e4be3f1ed63faba73bd4bbd593ae7bdf2 Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Samaniego Date: Tue, 4 Jun 2019 10:56:27 -0700 Subject: newlib: Upgrade to 3.1.0 Upgrade both newlib and libgloss to the yearly release 3.1.0. BSD-2 license was added on: 6864c08b94752d34cca Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Richard Purdie --- meta/recipes-core/newlib/libgloss_3.0.0.bb | 33 ------------------------------ meta/recipes-core/newlib/libgloss_3.1.0.bb | 33 ++++++++++++++++++++++++++++++ meta/recipes-core/newlib/newlib.inc | 8 ++++---- meta/recipes-core/newlib/newlib_3.0.0.bb | 19 ----------------- meta/recipes-core/newlib/newlib_3.1.0.bb | 19 +++++++++++++++++ 5 files changed, 56 insertions(+), 56 deletions(-) delete mode 100644 meta/recipes-core/newlib/libgloss_3.0.0.bb create mode 100644 meta/recipes-core/newlib/libgloss_3.1.0.bb delete mode 100644 meta/recipes-core/newlib/newlib_3.0.0.bb create mode 100644 meta/recipes-core/newlib/newlib_3.1.0.bb diff --git a/meta/recipes-core/newlib/libgloss_3.0.0.bb b/meta/recipes-core/newlib/libgloss_3.0.0.bb deleted file mode 100644 index c9ed30d988..0000000000 --- a/meta/recipes-core/newlib/libgloss_3.0.0.bb +++ /dev/null @@ -1,33 +0,0 @@ -require newlib.inc - -DEPENDS += "newlib" - -FILESEXTRAPATHS_prepend := "${THISDIR}/libgloss:" - -SRC_URI_append_powerpc = " file://fix-rs6000-crt0.patch" -SRC_URI_append_arm = " file://fix_makefile_include_arm_h.patch" - -do_configure() { - ${S}/libgloss/configure ${EXTRA_OECONF} -} - -do_install_prepend() { - # install doesn't create this itself, avoid install error - install -d ${D}${prefix}/${TARGET_SYS}/lib -} - -do_install_append() { - # Move libs to default directories so they can be picked up later - install -d ${D}${libdir} - mv -v ${D}${prefix}/${TARGET_SYS}/lib/* ${D}${libdir} - - # Remove original directory - rmdir -p --ignore-fail-on-non-empty ${D}${prefix}/${TARGET_SYS}/lib -} - -# Split packages correctly -FILES_${PN} += "${libdir}/*.ld ${libdir}/*.specs" -FILES_${PN}-dev += "${libdir}/cpu-init/*" - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/meta/recipes-core/newlib/libgloss_3.1.0.bb b/meta/recipes-core/newlib/libgloss_3.1.0.bb new file mode 100644 index 0000000000..c9ed30d988 --- /dev/null +++ b/meta/recipes-core/newlib/libgloss_3.1.0.bb @@ -0,0 +1,33 @@ +require newlib.inc + +DEPENDS += "newlib" + +FILESEXTRAPATHS_prepend := "${THISDIR}/libgloss:" + +SRC_URI_append_powerpc = " file://fix-rs6000-crt0.patch" +SRC_URI_append_arm = " file://fix_makefile_include_arm_h.patch" + +do_configure() { + ${S}/libgloss/configure ${EXTRA_OECONF} +} + +do_install_prepend() { + # install doesn't create this itself, avoid install error + install -d ${D}${prefix}/${TARGET_SYS}/lib +} + +do_install_append() { + # Move libs to default directories so they can be picked up later + install -d ${D}${libdir} + mv -v ${D}${prefix}/${TARGET_SYS}/lib/* ${D}${libdir} + + # Remove original directory + rmdir -p --ignore-fail-on-non-empty ${D}${prefix}/${TARGET_SYS}/lib +} + +# Split packages correctly +FILES_${PN} += "${libdir}/*.ld ${libdir}/*.specs" +FILES_${PN}-dev += "${libdir}/cpu-init/*" + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/meta/recipes-core/newlib/newlib.inc b/meta/recipes-core/newlib/newlib.inc index f50e5fed81..418cf07939 100644 --- a/meta/recipes-core/newlib/newlib.inc +++ b/meta/recipes-core/newlib/newlib.inc @@ -3,21 +3,21 @@ HOMEPAGE = "https://sourceware.org/newlib/" DESCRIPTION = "C library intended for use on embedded systems. It is a conglomeration of several library parts, all under free software licenses that make them easily usable on embedded products." SECTION = "libs" -LICENSE = "GPLv2 & LGPLv3 & GPLv3 & LGPLv2" +LICENSE = "GPLv2 & LGPLv3 & GPLv3 & LGPLv2 & BSD-2-Clause" LIC_FILES_CHKSUM = " \ file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \ file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \ file://COPYING.LIBGLOSS;md5=73f5c98779aea7dba4a6c94a74ab0ae2 \ file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ - file://COPYING.NEWLIB;md5=956a4b1487f7677cdcceeee8f05a21f0 \ + file://COPYING.NEWLIB;md5=100d470af54e2d1d79fbd8498a32ff26 \ file://newlib/libc/posix/COPYRIGHT;md5=103468ff1982be840fdf4ee9f8b51bbf \ file://newlib/libc/sys/linux/linuxthreads/LICENSE;md5=73640207fbc79b198c7ffd4ad4d97aa0 \ " SRC_URI = "ftp://sourceware.org/pub/newlib/newlib-${PV}.tar.gz" -SRC_URI[md5sum] = "81ec873108b8593c586f91ca65963952" -SRC_URI[sha256sum] = "c8566335ee74e5fcaeb8595b4ebd0400c4b043d6acb3263ecb1314f8f5501332" +SRC_URI[md5sum] = "f84263b7d524df92a9c9fb30b79e0134" +SRC_URI[sha256sum] = "fb4fa1cc21e9060719208300a61420e4089d6de6ef59cf533b57fe74801d102a" INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "virtual/${TARGET_PREFIX}gcc" diff --git a/meta/recipes-core/newlib/newlib_3.0.0.bb b/meta/recipes-core/newlib/newlib_3.0.0.bb deleted file mode 100644 index db13724eb5..0000000000 --- a/meta/recipes-core/newlib/newlib_3.0.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -require newlib.inc - -PROVIDES += "virtual/libc virtual/libiconv virtual/libintl" - -do_configure() { - ${S}/configure ${EXTRA_OECONF} -} - -do_install_append() { - # Move include files and libs to default directories so they can be picked up later - mv -v ${D}${prefix}/${TARGET_SYS}/lib ${D}${libdir} - mv -v ${D}${prefix}/${TARGET_SYS}/include ${D}${includedir} - - # Remove original directory - rmdir ${D}${prefix}/${TARGET_SYS} -} - -# No rpm package is actually created but -dev depends on it, avoid dnf error -RDEPENDS_${PN}-dev_libc-newlib = "" diff --git a/meta/recipes-core/newlib/newlib_3.1.0.bb b/meta/recipes-core/newlib/newlib_3.1.0.bb new file mode 100644 index 0000000000..db13724eb5 --- /dev/null +++ b/meta/recipes-core/newlib/newlib_3.1.0.bb @@ -0,0 +1,19 @@ +require newlib.inc + +PROVIDES += "virtual/libc virtual/libiconv virtual/libintl" + +do_configure() { + ${S}/configure ${EXTRA_OECONF} +} + +do_install_append() { + # Move include files and libs to default directories so they can be picked up later + mv -v ${D}${prefix}/${TARGET_SYS}/lib ${D}${libdir} + mv -v ${D}${prefix}/${TARGET_SYS}/include ${D}${includedir} + + # Remove original directory + rmdir ${D}${prefix}/${TARGET_SYS} +} + +# No rpm package is actually created but -dev depends on it, avoid dnf error +RDEPENDS_${PN}-dev_libc-newlib = "" -- cgit 1.2.3-korg