From ba962c8cd4f39f72028662db4cb8505befe64206 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 13 Feb 2017 10:00:12 -0800 Subject: gmp: Update to 6.1.2 (From OE-Core rev: a341bc666c6d25741bbe879ccf0ade8da6ba4373) Signed-off-by: Khem Raj Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...user-provided-flags-to-the-auto-detected-.patch | 61 ---------------------- ...re.ac-Believe-the-cflags-from-environment.patch | 52 ------------------ meta/recipes-support/gmp/gmp-6.1.1/amd64.patch | 18 ------- .../gmp/gmp-6.1.1/use-includedir.patch | 15 ------ ...user-provided-flags-to-the-auto-detected-.patch | 61 ++++++++++++++++++++++ ...re.ac-Believe-the-cflags-from-environment.patch | 52 ++++++++++++++++++ meta/recipes-support/gmp/gmp-6.1.2/amd64.patch | 18 +++++++ .../gmp/gmp-6.1.2/use-includedir.patch | 15 ++++++ meta/recipes-support/gmp/gmp_6.1.1.bb | 39 -------------- meta/recipes-support/gmp/gmp_6.1.2.bb | 38 ++++++++++++++ 10 files changed, 184 insertions(+), 185 deletions(-) delete mode 100644 meta/recipes-support/gmp/gmp-6.1.1/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch delete mode 100644 meta/recipes-support/gmp/gmp-6.1.1/0001-confiure.ac-Believe-the-cflags-from-environment.patch delete mode 100644 meta/recipes-support/gmp/gmp-6.1.1/amd64.patch delete mode 100644 meta/recipes-support/gmp/gmp-6.1.1/use-includedir.patch create mode 100644 meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch create mode 100644 meta/recipes-support/gmp/gmp-6.1.2/0001-confiure.ac-Believe-the-cflags-from-environment.patch create mode 100644 meta/recipes-support/gmp/gmp-6.1.2/amd64.patch create mode 100644 meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch delete mode 100644 meta/recipes-support/gmp/gmp_6.1.1.bb create mode 100644 meta/recipes-support/gmp/gmp_6.1.2.bb (limited to 'meta/recipes-support/gmp') diff --git a/meta/recipes-support/gmp/gmp-6.1.1/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch b/meta/recipes-support/gmp/gmp-6.1.1/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.1/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 -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 -Signed-off-by: Alexander Kanavin ---- - 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 < -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 ---- -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(,1)"]) - ;; - esac - ;; --- -1.9.1 - diff --git a/meta/recipes-support/gmp/gmp-6.1.1/amd64.patch b/meta/recipes-support/gmp/gmp-6.1.1/amd64.patch deleted file mode 100644 index 564d12d42b..0000000000 --- a/meta/recipes-support/gmp/gmp-6.1.1/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.1/use-includedir.patch b/meta/recipes-support/gmp/gmp-6.1.1/use-includedir.patch deleted file mode 100644 index 74904a2530..0000000000 --- a/meta/recipes-support/gmp/gmp-6.1.1/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) 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 new file mode 100644 index 0000000000..325ffe491f --- /dev/null +++ b/meta/recipes-support/gmp/gmp-6.1.2/0001-Append-the-user-provided-flags-to-the-auto-detected-.patch @@ -0,0 +1,61 @@ +From d3b9fc523fc11260ced890c35bc5c9e6391c8656 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 +Signed-off-by: Alexander Kanavin +--- + 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 < +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 +--- +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(,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 new file mode 100644 index 0000000000..564d12d42b --- /dev/null +++ b/meta/recipes-support/gmp/gmp-6.1.2/amd64.patch @@ -0,0 +1,18 @@ +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 new file mode 100644 index 0000000000..74904a2530 --- /dev/null +++ b/meta/recipes-support/gmp/gmp-6.1.2/use-includedir.patch @@ -0,0 +1,15 @@ +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) diff --git a/meta/recipes-support/gmp/gmp_6.1.1.bb b/meta/recipes-support/gmp/gmp_6.1.1.bb deleted file mode 100644 index 614d21ab7d..0000000000 --- a/meta/recipes-support/gmp/gmp_6.1.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -require gmp.inc - -LICENSE = "GPLv2+ | LGPLv3+" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ - file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ - file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ -" - -REVISION = "" -SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \ - file://amd64.patch \ - file://use-includedir.patch \ - file://0001-Append-the-user-provided-flags-to-the-auto-detected-.patch \ - file://0001-confiure.ac-Believe-the-cflags-from-environment.patch \ - " - -SRC_URI[md5sum] = "4c175f86e11eb32d8bf9872ca3a8e11d" -SRC_URI[sha256sum] = "a8109865f2893f1373b0a8ed5ff7429de8db696fc451b1036bd7bdf95bbeffd6" - -acpaths = "" - -EXTRA_OECONF += " --enable-cxx=detect" -EXTRA_OECONF_mipsarchr6_append = " --disable-assembly" - -PACKAGES =+ "libgmpxx" -FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}" - -do_install_append_class-target() { - sed -i "s|--sysroot=${STAGING_DIR_HOST}||g" ${D}${includedir}/gmp.h -} - -SSTATE_SCAN_FILES += "gmp.h" - -# Doesn't compile in MIPS16e mode due to use of hand-written -# assembly -MIPS_INSTRUCTION_SET = "mips" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/gmp/gmp_6.1.2.bb b/meta/recipes-support/gmp/gmp_6.1.2.bb new file mode 100644 index 0000000000..5e65075585 --- /dev/null +++ b/meta/recipes-support/gmp/gmp_6.1.2.bb @@ -0,0 +1,38 @@ +require gmp.inc + +LICENSE = "GPLv2+ | LGPLv3+" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ + file://COPYINGv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ +" + +REVISION = "" +SRC_URI = "https://gmplib.org/download/${BPN}/${BP}${REVISION}.tar.bz2 \ + file://amd64.patch \ + file://use-includedir.patch \ + file://0001-Append-the-user-provided-flags-to-the-auto-detected-.patch \ + file://0001-confiure.ac-Believe-the-cflags-from-environment.patch \ + " +SRC_URI[md5sum] = "8ddbb26dc3bd4e2302984debba1406a5" +SRC_URI[sha256sum] = "5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2" + +acpaths = "" + +EXTRA_OECONF += " --enable-cxx=detect" +EXTRA_OECONF_mipsarchr6_append = " --disable-assembly" + +PACKAGES =+ "libgmpxx" +FILES_libgmpxx = "${libdir}/libgmpxx${SOLIBS}" + +do_install_append_class-target() { + sed -i "s|--sysroot=${STAGING_DIR_HOST}||g" ${D}${includedir}/gmp.h +} + +SSTATE_SCAN_FILES += "gmp.h" + +# Doesn't compile in MIPS16e mode due to use of hand-written +# assembly +MIPS_INSTRUCTION_SET = "mips" + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg