diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-08-27 16:05:59 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-01 11:43:59 +0100 |
commit | 6fac60da96eee89d5b7c2156bbb92fe72dc28aef (patch) | |
tree | af55f9157508f35ece55c012d3e8cb25ac532e71 /meta/recipes-support/gmp/gmp.inc | |
parent | b9ade91413f56ffeeeec753a45e3d1d64efe4802 (diff) | |
download | poky-6fac60da96eee89d5b7c2156bbb92fe72dc28aef.tar.gz |
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]
(From OE-Core rev: 1adec83621f36a3dd748990c307ca4ebebcdd554)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gmp/gmp.inc')
-rw-r--r-- | meta/recipes-support/gmp/gmp.inc | 19 |
1 files changed, 1 insertions, 18 deletions
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" | |||
2 | SUMMARY = "GNU multiprecision arithmetic library" | 2 | SUMMARY = "GNU multiprecision arithmetic library" |
3 | DESCRIPTION = "GMP is a free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers" | 3 | DESCRIPTION = "GMP is a free library for arbitrary precision arithmetic, operating on signed integers, rational numbers, and floating point numbers" |
4 | HOMEPAGE = "http://gmplib.org/" | 4 | HOMEPAGE = "http://gmplib.org/" |
5 | LICENSE = "GPLv3 LGPLv3" | ||
6 | 5 | ||
7 | REVISION ?= "" | 6 | REVISION ?= "" |
8 | 7 | SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2" | |
9 | SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \ | ||
10 | file://configure.patch \ | ||
11 | file://amd64.patch " | ||
12 | 8 | ||
13 | inherit autotools texinfo | 9 | inherit autotools texinfo |
14 | 10 | ||
15 | ARM_INSTRUCTION_SET = "arm" | 11 | ARM_INSTRUCTION_SET = "arm" |
16 | 12 | ||
17 | acpaths = "" | ||
18 | |||
19 | BBCLASSEXTEND = "native nativesdk" | 13 | BBCLASSEXTEND = "native nativesdk" |
20 | 14 | ||
21 | PACKAGECONFIG ??= "" | 15 | PACKAGECONFIG ??= "" |
22 | PACKAGECONFIG[readline] = "--with-readline=yes,--with-readline=no,readline" | 16 | PACKAGECONFIG[readline] = "--with-readline=yes,--with-readline=no,readline" |
23 | |||
24 | EXTRA_OECONF += " --enable-cxx=detect" | ||
25 | |||
26 | PACKAGES =+ "libgmpxx" | ||
27 | FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}" | ||
28 | |||
29 | do_install_append_class-target() { | ||
30 | sed -i "s|--sysroot=${STAGING_DIR_HOST}||g" ${D}${includedir}/gmp.h | ||
31 | } | ||
32 | |||
33 | SSTATE_SCAN_FILES += "gmp.h" | ||