summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gmp
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/gmp')
-rw-r--r--meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch19
-rw-r--r--meta/recipes-support/gmp/gmp-6.1.2/amd64.patch10
-rw-r--r--meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch14
3 files changed, 20 insertions, 23 deletions
diff --git a/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch b/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch
index 665367658b..1e47924ccc 100644
--- a/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch
+++ b/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch
@@ -18,13 +18,13 @@ Upstream-Status: Inappropriate[OE-Specific]
18 configure.ac | 11 ----------- 18 configure.ac | 11 -----------
19 1 file changed, 11 deletions(-) 19 1 file changed, 11 deletions(-)
20 20
21diff --git a/configure.ac b/configure.ac 21Index: gmp-6.1.2/configure.ac
22index 857ea3b..359e919 100644 22===================================================================
23--- a/configure.ac 23--- gmp-6.1.2.orig/configure.ac
24+++ b/configure.ac 24+++ gmp-6.1.2/configure.ac
25@@ -607,15 +607,6 @@ case $host in 25@@ -604,15 +604,6 @@ case $host in
26 GMP_INCLUDE_MPN(arm/arm-defs.m4) 26 any_32_testlist="sizeof-long-4"
27 CALLING_CONVENTIONS_OBJS='arm32call.lo arm32check.lo' 27 any_64_testlist="sizeof-long-8"
28 28
29- # This is needed for clang, which is not content with flags like -mfpu=neon 29- # This is needed for clang, which is not content with flags like -mfpu=neon
30- # alone. 30- # alone.
@@ -38,7 +38,7 @@ index 857ea3b..359e919 100644
38 # FIXME: We make mandatory compiler options optional here. We should 38 # FIXME: We make mandatory compiler options optional here. We should
39 # either enforce them, or organise to strip paths as the corresponding 39 # either enforce them, or organise to strip paths as the corresponding
40 # options fail. 40 # options fail.
41@@ -686,8 +677,6 @@ case $host in 41@@ -746,8 +737,6 @@ case $host in
42 ;; 42 ;;
43 *) 43 *)
44 path="arm" 44 path="arm"
@@ -47,6 +47,3 @@ index 857ea3b..359e919 100644
47 ;; 47 ;;
48 esac 48 esac
49 ;; 49 ;;
50--
511.9.1
52
diff --git a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch b/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch
index 564d12d42b..3935589f8b 100644
--- a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch
+++ b/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch
@@ -1,10 +1,10 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3Index: gmp-5.0.3/longlong.h 3Index: gmp-6.1.2/longlong.h
4=================================================================== 4===================================================================
5--- gmp-5.0.3.orig/longlong.h 5--- gmp-6.1.2.orig/longlong.h
6+++ gmp-5.0.3/longlong.h 6+++ gmp-6.1.2/longlong.h
7@@ -994,8 +994,10 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ( 7@@ -1036,8 +1036,10 @@ extern UWtype __MPN(udiv_qrnnd) (UWtype
8 count is only an int. */ 8 count is only an int. */
9 #define count_trailing_zeros(count, x) \ 9 #define count_trailing_zeros(count, x) \
10 do { \ 10 do { \
@@ -14,5 +14,5 @@ Index: gmp-5.0.3/longlong.h
14+ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \ 14+ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \
15+ (count) = __cbtmp; \ 15+ (count) = __cbtmp; \
16 } while (0) 16 } while (0)
17 #endif /* x86_64 */ 17 #endif /* __amd64__ */
18 18
diff --git a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch b/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch
index 74904a2530..6b089cf39c 100644
--- a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch
+++ b/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch
@@ -1,15 +1,15 @@
1Upstream-Status: Pending 1Upstream-Status: Pending
2 2
3Index: gmp-4.2.4/Makefile.am 3Index: gmp-6.1.2/Makefile.am
4=================================================================== 4===================================================================
5--- gmp-4.2.4.orig/Makefile.am 2008-09-10 19:31:27.000000000 +0000 5--- gmp-6.1.2.orig/Makefile.am
6+++ gmp-4.2.4/Makefile.am 2009-07-06 20:19:19.000000000 +0000 6+++ gmp-6.1.2/Makefile.am
7@@ -106,7 +106,7 @@ 7@@ -130,7 +130,7 @@ EXTRA_DIST += gmpxx.h
8 # but anyone knowledgable enough to be playing with exec_prefix will be able 8 # but anyone knowledgeable enough to be playing with exec_prefix will be able
9 # to address that. 9 # to address that.
10 # 10 #
11-includeexecdir = $(exec_prefix)/include 11-includeexecdir = $(exec_prefix)/include
12+includeexecdir = $(includedir) 12+includeexecdir = $(includedir)
13 include_HEADERS = $(GMPXX_HEADERS_OPTION) 13 include_HEADERS = $(GMPXX_HEADERS_OPTION)
14 nodist_includeexec_HEADERS = gmp.h $(MPBSD_HEADERS_OPTION) 14 nodist_includeexec_HEADERS = gmp.h
15 lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION) $(MPBSD_LTLIBRARIES_OPTION) 15 lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION)