From 1adec83621f36a3dd748990c307ca4ebebcdd554 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Thu, 27 Aug 2015 16:05:59 +0300 Subject: gmp: Bring back version 4.2.1 (LGPL 2.1+) gmp 4.2.1 was removed in f181c6ce8b apparently accidentally: It was not noticed that 4.2.1 is LGPL 2.1 (and not GPL) so provides a useful alternative to the newer "GPLv2 | LGPLv3" version. * Reintroduce 4.2.1. The source includes files that are GPL but the library package is LGPL 2.1+ * Also reintroduce the two patches removed in f181c6ce8b. * Refactor gmp.inc: gmp 6.0.0 build should not be affected in any way. * Update 6.0.0 license from "GPLv2 | LGPLv3" to "GPLv2+ | LGPLv3+". [YOCTO #8197] Signed-off-by: Jussi Kukkonen Signed-off-by: Richard Purdie --- meta/recipes-support/gmp/gmp.inc | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'meta/recipes-support/gmp/gmp.inc') diff --git a/meta/recipes-support/gmp/gmp.inc b/meta/recipes-support/gmp/gmp.inc index 65cde21a7d..6752a39d13 100644 --- a/meta/recipes-support/gmp/gmp.inc +++ b/meta/recipes-support/gmp/gmp.inc @@ -2,32 +2,15 @@ SECTION = "devel" SUMMARY = "GNU multiprecision arithmetic library" DESCRIPTION = "GMP is a free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers" HOMEPAGE = "http://gmplib.org/" -LICENSE = "GPLv3 LGPLv3" REVISION ?= "" - -SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \ - file://configure.patch \ - file://amd64.patch " +SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2" inherit autotools texinfo ARM_INSTRUCTION_SET = "arm" -acpaths = "" - BBCLASSEXTEND = "native nativesdk" PACKAGECONFIG ??= "" PACKAGECONFIG[readline] = "--with-readline=yes,--with-readline=no,readline" - -EXTRA_OECONF += " --enable-cxx=detect" - -PACKAGES =+ "libgmpxx" -FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}" - -do_install_append_class-target() { - sed -i "s|--sysroot=${STAGING_DIR_HOST}||g" ${D}${includedir}/gmp.h -} - -SSTATE_SCAN_FILES += "gmp.h" -- cgit 1.2.3-korg