summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gmp/gmp-6.1.2
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/gmp/gmp-6.1.2')
-rw-r--r--meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch61
-rw-r--r--meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch52
-rw-r--r--meta/recipes-support/gmp/gmp-6.1.2/amd64.patch18
-rw-r--r--meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch15
4 files changed, 0 insertions, 146 deletions
diff --git a/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch b/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch
deleted file mode 100644
index 325ffe491f..0000000000
--- a/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From d3b9fc523fc11260ced890c35bc5c9e6391c8656 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 14 Dec 2015 14:19:49 +0200
-Subject: [PATCH] Append the user provided flags to the auto-detected ones.
-
-Upstream-Status: Inappropriate
-Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- configure.ac | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9cedfeb..87caee5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1921,8 +1921,12 @@ cclist=$cclist
- EOF
-
-
--test_CFLAGS=${CFLAGS+set}
--test_CPPFLAGS=${CPPFLAGS+set}
-+test_CFLAGS=
-+test_CPPFLAGS=
-+
-+user_CFLAGS=$CFLAGS
-+user_CPPFLAGS=$CPPFLAGS
-+user_CXXFLAGS=$CXXFLAGS
-
- for abi in $abilist; do
- abi_last="$abi"
-@@ -2353,7 +2357,7 @@ AC_SUBST(CCAS)
- # The C++ compiler, if desired.
- want_cxx=no
- if test $enable_cxx != no; then
-- test_CXXFLAGS=${CXXFLAGS+set}
-+ test_CXXFLAGS=
- AC_PROG_CXX
-
- echo "CXXFLAGS chosen by autoconf: $CXXFLAGS" >&AC_FD_CC
-@@ -2381,7 +2385,7 @@ if test $enable_cxx != no; then
- # Automake includes $CPPFLAGS in a C++ compile, so we do the same here.
- #
- for cxxflags_choice in $cxxflags_list; do
-- eval CXXFLAGS=\"\$cxxflags_$cxxflags_choice\"
-+ eval CXXFLAGS=\"\$cxxflags_$cxxflags_choice $user_CXXFLAGS\"
- GMP_PROG_CXX_WORKS($CXX $CPPFLAGS $CXXFLAGS,
- [want_cxx=yes
- break])
-@@ -2477,6 +2481,8 @@ if test "$enable_assembly" = "no"; then
- # done
- fi
-
-+CFLAGS="$CFLAGS $user_CFLAGS"
-+CPPFLAGS="$CPPFLAGS $user_CPPFLAGS"
-
- cat >&AC_FD_CC <<EOF
- Decided:
---
-2.6.2
-
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
deleted file mode 100644
index 665367658b..0000000000
--- a/meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From ae1a4c37417a3bbbf8ea1cab198982b0cad47e29 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 12 Aug 2016 17:08:13 +0000
-Subject: [PATCH] confiure.ac: Believe the cflags from environment
-
-In some toolchains e.g. OpenEmbedded -march options
-are passed on compiler cmdline, it does not use
-the expected target triplets to make these decision
-during configure.
-
-Secondly, dont set armv4 for march when no selection
-is made, since it is passed from cmdline
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Inappropriate[OE-Specific]
-
- configure.ac | 11 -----------
- 1 file changed, 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 857ea3b..359e919 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -607,15 +607,6 @@ case $host in
- GMP_INCLUDE_MPN(arm/arm-defs.m4)
- CALLING_CONVENTIONS_OBJS='arm32call.lo arm32check.lo'
-
-- # This is needed for clang, which is not content with flags like -mfpu=neon
-- # alone.
-- case $host in
-- *-*-*eabi)
-- gcc_cflags_fpmode="-mfloat-abi=softfp" ;;
-- *-*-*eabihf)
-- gcc_cflags_fpmode="-mfloat-abi=hard" ;;
-- esac
--
- # FIXME: We make mandatory compiler options optional here. We should
- # either enforce them, or organise to strip paths as the corresponding
- # options fail.
-@@ -686,8 +677,6 @@ case $host in
- ;;
- *)
- path="arm"
-- gcc_cflags_arch="-march=armv4"
-- GMP_DEFINE_RAW(["define(<NOTHUMB>,1)"])
- ;;
- esac
- ;;
---
-1.9.1
-
diff --git a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch b/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch
deleted file mode 100644
index 564d12d42b..0000000000
--- a/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Pending
-
-Index: gmp-5.0.3/longlong.h
-===================================================================
---- gmp-5.0.3.orig/longlong.h
-+++ gmp-5.0.3/longlong.h
-@@ -994,8 +994,10 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO (
- count is only an int. */
- #define count_trailing_zeros(count, x) \
- do { \
-+ UDItype __cbtmp; \
- ASSERT ((x) != 0); \
-- __asm__ ("bsfq %1,%q0" : "=r" (count) : "rm" ((UDItype)(x))); \
-+ __asm__ ("bsfq %1,%0" : "=r" (__cbtmp) : "rm" ((UDItype)(x))); \
-+ (count) = __cbtmp; \
- } while (0)
- #endif /* x86_64 */
-
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
deleted file mode 100644
index 74904a2530..0000000000
--- a/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-Index: gmp-4.2.4/Makefile.am
-===================================================================
---- gmp-4.2.4.orig/Makefile.am 2008-09-10 19:31:27.000000000 +0000
-+++ gmp-4.2.4/Makefile.am 2009-07-06 20:19:19.000000000 +0000
-@@ -106,7 +106,7 @@
- # but anyone knowledgable enough to be playing with exec_prefix will be able
- # to address that.
- #
--includeexecdir = $(exec_prefix)/include
-+includeexecdir = $(includedir)
- include_HEADERS = $(GMPXX_HEADERS_OPTION)
- nodist_includeexec_HEADERS = gmp.h $(MPBSD_HEADERS_OPTION)
- lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION) $(MPBSD_LTLIBRARIES_OPTION)