summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gmp
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-02 12:04:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-07 20:05:31 +0000
commit2345af9b4829ed3eed5abf60f2483055649f8af7 (patch)
tree96a9a31e4b1957b93c4fe3eb669117d2752caf0d /meta/recipes-support/gmp
parentc4901328fe5cf912c0965e5b011b64a95a9bcb9d (diff)
downloadpoky-2345af9b4829ed3eed5abf60f2483055649f8af7.tar.gz
recipes: Move out stale GPLv2 versions to a seperate layeruninative-1.5
These are recipes where the upstream has moved to GPLv3 and these old versions are the last ones under the GPLv2 license. There are several reasons for making this move. There is a different quality of service with these recipes in that they don't get security fixes and upstream no longer care about them, in fact they're actively hostile against people using old versions. The recipes tend to need a different kind of maintenance to work with changes in the wider ecosystem and there needs to be isolation between changes made in the v3 versions and those in the v2 versions. There are probably better ways to handle a "non-GPLv3" system but right now having these in OE-Core makes them look like a first class citizen when I believe they have potential for a variety of undesireable issues. Moving them into a separate layer makes their different needs clearer, it also makes it clear how many of these there are. Some are probably not needed (e.g. mc), I also wonder whether some are useful (e.g. gmp) since most things that use them are GPLv3 only already. Someone could now more clearly see how to streamline the list of recipes here. I'm proposing we mmove to this separate layer for 2.3 with its future maintinership and testing to be determined in 2.4 and beyond. (From OE-Core rev: 19b7e950346fb1dde6505c45236eba6cd9b33b4b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gmp')
-rw-r--r--meta/recipes-support/gmp/gmp-4.2.1/Use-__gnu_inline__-attribute.patch36
-rw-r--r--meta/recipes-support/gmp/gmp-4.2.1/avoid-h-asm-constraint-for-MIPS.patch57
-rw-r--r--meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch56
-rw-r--r--meta/recipes-support/gmp/gmp_4.2.1.bb17
4 files changed, 0 insertions, 166 deletions
diff --git a/meta/recipes-support/gmp/gmp-4.2.1/Use-__gnu_inline__-attribute.patch b/meta/recipes-support/gmp/gmp-4.2.1/Use-__gnu_inline__-attribute.patch
deleted file mode 100644
index 627d71aba9..0000000000
--- a/meta/recipes-support/gmp/gmp-4.2.1/Use-__gnu_inline__-attribute.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 3cb33502bafd04b8ad4ca3454fab16d5ff313297 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 22 Sep 2015 13:16:23 +0300
4Subject: [PATCH] Use __gnu_inline__ attribute
5
6gcc5 uses C11 inline rules. This means the old "extern inline"
7semantics are not available without a special attribute.
8
9See: https://gcc.gnu.org/gcc-5/porting_to.html
10
11Upstream-Status: Inappropriate [Fixed in current versions]
12Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
13---
14 gmp-h.in | 5 ++++-
15 1 file changed, 4 insertions(+), 1 deletion(-)
16
17diff --git a/gmp-h.in b/gmp-h.in
18index eed6fe4..361dd1d 100644
19--- a/gmp-h.in
20+++ b/gmp-h.in
21@@ -419,8 +419,11 @@ typedef __mpq_struct *mpq_ptr;
22 /* gcc has __inline__ in all modes, including strict ansi. Give a prototype
23 for an inline too, so as to correctly specify "dllimport" on windows, in
24 case the function is called rather than inlined. */
25+
26+/* Use __gnu_inline__ attribute: later gcc uses different "extern inline"
27+ behaviour */
28 #ifdef __GNUC__
29-#define __GMP_EXTERN_INLINE extern __inline__
30+#define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__))
31 #define __GMP_INLINE_PROTOTYPES 1
32 #endif
33
34--
352.1.4
36
diff --git a/meta/recipes-support/gmp/gmp-4.2.1/avoid-h-asm-constraint-for-MIPS.patch b/meta/recipes-support/gmp/gmp-4.2.1/avoid-h-asm-constraint-for-MIPS.patch
deleted file mode 100644
index 6da0be9ca0..0000000000
--- a/meta/recipes-support/gmp/gmp-4.2.1/avoid-h-asm-constraint-for-MIPS.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From d50686de0406a88ef9112f5252103f799982e84a Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Thu, 4 Feb 2016 14:00:00 -0800
4Subject: [PATCH] avoid h asm constraint for MIPS
5
6The h asm constrain (to extract the high part of a multiplication
7result) has not been recognised since gcc 4.4:
8
9 https://gcc.gnu.org/gcc-4.4/changes.html
10
11Drop the MIPS umul_ppmm() implementations which rely on "=h" and fall
12back to the older implementations (which use explicit mfhi and mflo
13instructions to move the high and low parts of the multiplication
14result into their destinations).
15
16Upstream-Status: Inappropriate [upstream has a different solution]
17
18Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
19---
20 longlong.h | 10 ----------
21 1 file changed, 10 deletions(-)
22
23diff --git a/longlong.h b/longlong.h
24index b53fbee..0193abb 100644
25--- a/longlong.h
26+++ b/longlong.h
27@@ -1011,27 +1011,17 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ((UWtype *, UWtype, UWtype, UWtype));
28 #endif /* __m88000__ */
29
30 #if defined (__mips) && W_TYPE_SIZE == 32
31-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
32-#define umul_ppmm(w1, w0, u, v) \
33- __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
34-#else
35 #define umul_ppmm(w1, w0, u, v) \
36 __asm__ ("multu %2,%3\n\tmflo %0\n\tmfhi %1" \
37 : "=d" (w0), "=d" (w1) : "d" (u), "d" (v))
38-#endif
39 #define UMUL_TIME 10
40 #define UDIV_TIME 100
41 #endif /* __mips */
42
43 #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
44-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
45-#define umul_ppmm(w1, w0, u, v) \
46- __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
47-#else
48 #define umul_ppmm(w1, w0, u, v) \
49 __asm__ ("dmultu %2,%3\n\tmflo %0\n\tmfhi %1" \
50 : "=d" (w0), "=d" (w1) : "d" (u), "d" (v))
51-#endif
52 #define UMUL_TIME 20
53 #define UDIV_TIME 140
54 #endif /* __mips */
55--
561.9.1
57
diff --git a/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch b/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch
deleted file mode 100644
index 26fd8ef8bc..0000000000
--- a/meta/recipes-support/gmp/gmp-4.2.1/gmp_fix_for_automake-1.12.patch
+++ /dev/null
@@ -1,56 +0,0 @@
1automake 1.12 has depricated automatic de-ANSI-fication support
2
3this patch avoids these kinds of errors:
4
5| configure.in:2240: error: automatic de-ANSI-fication support has been removed
6| Makefile.am:28: error: automatic de-ANSI-fication support has been removed
7
8Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
92012/05/02
10
11
12This patch was removed in f181c6ce8b3 when gmp 4.2.1 was mistakenly
13dropped.
14
15Upstream is not interested in patches for ancient versions.
16
17Upstream-Status: Inappropriate
18Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
19
20
21Index: gmp-4.2.1/configure.in
22===================================================================
23--- gmp-4.2.1.orig/configure.in
24+++ gmp-4.2.1/configure.in
25@@ -67,7 +67,7 @@ dnl
26 dnl Note that there's a copy of these options in the top-level Makefile.am,
27 dnl so update there too if changing anything.
28 dnl
29-AM_INIT_AUTOMAKE([1.8 gnu no-dependencies $(top_builddir)/ansi2knr])
30+AM_INIT_AUTOMAKE([1.8 gnu no-dependencies])
31 AM_CONFIG_HEADER(config.h:config.in)
32 AM_MAINTAINER_MODE
33
34@@ -2022,9 +2022,6 @@ fi
35 echo " MPN_PATH=\"$path\""
36
37
38-# Automake ansi2knr support.
39-AM_C_PROTOTYPES
40-
41 GMP_PROG_AR
42 GMP_PROG_NM
43
44Index: gmp-4.2.1/Makefile.am
45===================================================================
46--- gmp-4.2.1.orig/Makefile.am
47+++ gmp-4.2.1/Makefile.am
48@@ -27,7 +27,7 @@
49 # Makefiles in subdirectories, but here we must omit it so automake gives
50 # the actual ansi2knr build rule, not "cd $(top_builddir) && make ansi2knr".
51 #
52-AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies ansi2knr
53+AUTOMAKE_OPTIONS = 1.8 gnu no-dependencies
54
55
56 # Libtool -version-info for libgmp.la and libmp.la. See "Versioning" in the
diff --git a/meta/recipes-support/gmp/gmp_4.2.1.bb b/meta/recipes-support/gmp/gmp_4.2.1.bb
deleted file mode 100644
index 5e8ee29f36..0000000000
--- a/meta/recipes-support/gmp/gmp_4.2.1.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1require gmp.inc
2
3LICENSE = "LGPLv2.1+ & GPLv2+"
4LICENSE_${PN} = "LGPLv2.1+"
5
6LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a \
7 file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
8 file://gmp-h.in;beginline=6;endline=21;md5=e056f74a12c3277d730dbcfb85d2ca34"
9
10SRC_URI = "https://gmplib.org/download/${BPN}/archive/${BP}.tar.bz2 \
11 file://Use-__gnu_inline__-attribute.patch \
12 file://gmp_fix_for_automake-1.12.patch \
13 file://avoid-h-asm-constraint-for-MIPS.patch \
14"
15
16SRC_URI[md5sum] = "091c56e0e1cca6b09b17b69d47ef18e3"
17SRC_URI[sha256sum] = "d07ffcb37eecec35c5ec72516d10b35fdf6e6fef1fcf1dcd37e30b8cbf8bf941"