From a97ef3f1d3cbbdc4ef46b02c12605ea4194ac594 Mon Sep 17 00:00:00 2001 From: Alejandro Hernandez Samaniego Date: Thu, 27 Jan 2022 18:40:22 -0700 Subject: newlib: Upgrade 4.1.0 -> 4.2.0 (From OE-Core rev: 668445252fa96bd00ecdef1f610707a132eb35fc) Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Richard Purdie --- meta/recipes-core/newlib/libgloss_4.1.0.bb | 33 ------------------------------ meta/recipes-core/newlib/libgloss_4.2.0.bb | 33 ++++++++++++++++++++++++++++++ meta/recipes-core/newlib/newlib.inc | 12 ++++++++--- meta/recipes-core/newlib/newlib_4.1.0.bb | 20 ------------------ meta/recipes-core/newlib/newlib_4.2.0.bb | 20 ++++++++++++++++++ 5 files changed, 62 insertions(+), 56 deletions(-) delete mode 100644 meta/recipes-core/newlib/libgloss_4.1.0.bb create mode 100644 meta/recipes-core/newlib/libgloss_4.2.0.bb delete mode 100644 meta/recipes-core/newlib/newlib_4.1.0.bb create mode 100644 meta/recipes-core/newlib/newlib_4.2.0.bb diff --git a/meta/recipes-core/newlib/libgloss_4.1.0.bb b/meta/recipes-core/newlib/libgloss_4.1.0.bb deleted file mode 100644 index 8c8ee91395..0000000000 --- a/meta/recipes-core/newlib/libgloss_4.1.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_4.2.0.bb b/meta/recipes-core/newlib/libgloss_4.2.0.bb new file mode 100644 index 0000000000..8c8ee91395 --- /dev/null +++ b/meta/recipes-core/newlib/libgloss_4.2.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 23cd172008..5e488d0848 100644 --- a/meta/recipes-core/newlib/newlib.inc +++ b/meta/recipes-core/newlib/newlib.inc @@ -15,13 +15,19 @@ LIC_FILES_CHKSUM = " \ file://newlib/libc/sys/linux/linuxthreads/LICENSE;md5=73640207fbc79b198c7ffd4ad4d97aa0 \ " -SRC_URI = "https://sourceware.org/pub/newlib/newlib-${PV}.tar.gz" -SRC_URI[sha256sum] = "f296e372f51324224d387cc116dc37a6bd397198756746f93a2b02e9a5d40154" +# Newlib maintainers sometimes publish the source +# from a specific snapshot, after an upgrade we can +# delete the following line and keep the empty default +NEWLIB_SNAPSHOT = ".20211231" +NEWLIB_SNAPSHOT ?= "" +SRC_URI = "https://sourceware.org/pub/newlib/newlib-${PV}${NEWLIB_SNAPSHOT}.tar.gz" +SRC_URI[sha256sum] = "c3a0e8b63bc3bef1aeee4ca3906b53b3b86c8d139867607369cb2915ffc54435" + INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "virtual/${TARGET_PREFIX}gcc" -S = "${WORKDIR}/newlib-${PV}" +S = "${WORKDIR}/newlib-${PV}${NEWLIB_SNAPSHOT}" B = "${WORKDIR}/build" ## disable stdlib diff --git a/meta/recipes-core/newlib/newlib_4.1.0.bb b/meta/recipes-core/newlib/newlib_4.1.0.bb deleted file mode 100644 index 0542c596ba..0000000000 --- a/meta/recipes-core/newlib/newlib_4.1.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -require newlib.inc - -PROVIDES += "virtual/libc virtual/libiconv virtual/libintl" - -do_configure() { - export CC_FOR_TARGET="${CC}" - ${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_4.2.0.bb b/meta/recipes-core/newlib/newlib_4.2.0.bb new file mode 100644 index 0000000000..0542c596ba --- /dev/null +++ b/meta/recipes-core/newlib/newlib_4.2.0.bb @@ -0,0 +1,20 @@ +require newlib.inc + +PROVIDES += "virtual/libc virtual/libiconv virtual/libintl" + +do_configure() { + export CC_FOR_TARGET="${CC}" + ${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 v1.2.3-54-g00ecf