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-4.2.1/disable-stdc.patch | |
| 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-4.2.1/disable-stdc.patch')
| -rw-r--r-- | meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch b/meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch new file mode 100644 index 0000000000..5decb1cec5 --- /dev/null +++ b/meta/recipes-support/gmp/gmp-4.2.1/disable-stdc.patch | |||
| @@ -0,0 +1,39 @@ | |||
| 1 | This patch was removed in f181c6ce8b3 when gmp 4.2.1 was mistakenly | ||
| 2 | dropped. | ||
| 3 | |||
| 4 | Upstream is not interested in patches for ancient versions. | ||
| 5 | |||
| 6 | Upstream-Status: Inappropriate | ||
| 7 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
| 8 | |||
| 9 | # "extern inline" in traditional gcc means that the function should be | ||
| 10 | # inlined wherever it's seen, while in C99, "extern inline" means that i | ||
| 11 | # the function should only be inlined where the inline definition is | ||
| 12 | # seen while in other places it's not inlined: | ||
| 13 | # http://gcc.gnu.org/ml/gcc/2006-11/msg00006.html | ||
| 14 | # | ||
| 15 | # gmp checks "--std=gnu99" to use C99 convention however it internally | ||
| 16 | # defines some "extern inline" functions in gmp.h, which is included | ||
| 17 | # by mainly .c files and finally lead a flood of redefinition function | ||
| 18 | # errors when linking objects together. | ||
| 19 | # | ||
| 20 | # So disable C99/ANSI detection to stick to tranditional gcc behavior | ||
| 21 | # | ||
| 22 | # by Kevin Tian <kevin.tian@intel.com>, 2010-08-13 | ||
| 23 | # | ||
| 24 | # (this patch is licensed under GPLv2+) | ||
| 25 | |||
| 26 | diff --git a/configure.in b/configure.in | ||
| 27 | index 450cc92..aab0b59 100644 | ||
| 28 | --- a/configure.in | ||
| 29 | +++ b/configure.in | ||
| 30 | @@ -1869,9 +1869,7 @@ AC_SUBST(DEFN_LONG_LONG_LIMB) | ||
| 31 | |||
| 32 | # The C compiler and preprocessor, put into ANSI mode if possible. | ||
| 33 | AC_PROG_CC | ||
| 34 | -AC_PROG_CC_STDC | ||
| 35 | AC_PROG_CPP | ||
| 36 | -GMP_H_ANSI | ||
| 37 | |||
| 38 | |||
| 39 | # The C compiler on the build system, and associated tests. | ||
