diff options
Diffstat (limited to 'meta/recipes-support/gmp')
-rw-r--r-- | meta/recipes-support/gmp/gmp.inc | 4 | ||||
-rw-r--r-- | meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch | 2 | ||||
-rw-r--r-- | meta/recipes-support/gmp/gmp_6.3.0.bb (renamed from meta/recipes-support/gmp/gmp_6.2.1.bb) | 29 |
3 files changed, 22 insertions, 13 deletions
diff --git a/meta/recipes-support/gmp/gmp.inc b/meta/recipes-support/gmp/gmp.inc index 948b89288e..1872226616 100644 --- a/meta/recipes-support/gmp/gmp.inc +++ b/meta/recipes-support/gmp/gmp.inc @@ -8,5 +8,5 @@ inherit autotools texinfo multilib_header PACKAGECONFIG ??= "" PACKAGECONFIG[readline] = "--with-readline=yes,--with-readline=no,readline" -ARM_INSTRUCTION_SET_armv4 = "arm" -ARM_INSTRUCTION_SET_armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" diff --git a/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch b/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch index 56564db505..b26f4db98e 100644 --- a/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch +++ b/meta/recipes-support/gmp/gmp/0001-confiure.ac-Believe-the-cflags-from-environment.patch @@ -12,8 +12,8 @@ Secondly, dont set armv4 for march when no selection is made, since it is passed from cmdline Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Inappropriate [OE-Specific] --- -Upstream-Status: Inappropriate[OE-Specific] configure.ac | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/meta/recipes-support/gmp/gmp_6.2.1.bb b/meta/recipes-support/gmp/gmp_6.3.0.bb index 3c50f928ab..fd4aec92fd 100644 --- a/meta/recipes-support/gmp/gmp_6.2.1.bb +++ b/meta/recipes-support/gmp/gmp_6.3.0.bb @@ -1,10 +1,12 @@ require gmp.inc -LICENSE = "GPLv2+ | LGPLv3+" +LICENSE = "GPL-2.0-or-later | LGPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ +LIC_FILES_CHKSUM = "\ + file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYINGv3;md5=11cc2d3ee574f9d6b7ee797bdce4d423 \ " REVISION = "" @@ -13,28 +15,35 @@ SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \ file://0001-Append-the-user-provided-flags-to-the-auto-detected-.patch \ file://0001-confiure.ac-Believe-the-cflags-from-environment.patch \ " -SRC_URI[md5sum] = "28971fc21cf028042d4897f02fd355ea" -SRC_URI[sha256sum] = "eae9326beb4158c386e39a356818031bd28f3124cf915f8c5b1dc4c7a36b4d7c" +SRC_URI[sha256sum] = "ac28211a7cfb609bae2e2c8d6058d66c8fe96434f740cf6fe2e47b000d1c20cb" acpaths = "" EXTRA_OECONF += " --enable-cxx=detect" -EXTRA_OECONF_mipsarchr6_append = " --disable-assembly" +EXTRA_OECONF:append:mipsarchr6 = " --disable-assembly" PACKAGES =+ "libgmpxx" -FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}" +FILES:libgmpxx = "${libdir}/libgmpxx${SOLIBS}" -do_install_append() { +do_install:append() { oe_multilib_header gmp.h } -do_install_prepend_class-target() { +fix_absolute_paths () { sed -i \ -e "s|--sysroot=${STAGING_DIR_HOST}||g" \ -e "s|${DEBUG_PREFIX_MAP}||g" \ ${B}/gmp.h } +do_install:prepend:class-target() { + fix_absolute_paths +} + +do_install:prepend:class-nativesdk() { + fix_absolute_paths +} + SSTATE_SCAN_FILES += "gmp.h" # Doesn't compile in MIPS16e mode due to use of hand-written |