Skip to contentSkip to conversation

gmp: disable for MIPS R6

PATCH New Vicente Olivert Riera 3 participants 6 messages Nov 24, 2015

lore
Share & tools
lore

Vicente Olivert Riera

author
#0 lore raw

PATCH 1/1 gmp: disable for MIPS R6

gmplib is not yet supported for MIPS R6, so disable it and also propagate that dependency recursively to all packages who select it.

Fixes:

http://autobuild.buildroot.net/results/d06/d0686b3e7b8884f93034d4ea4b79fa8590ffa221/

Signed-off-by Vicente Olivert Riera <[email protected]>
---
 package/aiccu/Config.in                       | 1 +
 package/connman/Config.in                     | 1 +
 package/dnsmasq/Config.in                     | 1 +
 package/gmp/Config.in                         | 2 ++
 package/gnutls/Config.in                      | 1 +
 package/gstreamer1/gst1-plugins-bad/Config.in | 1 +
 package/guile/Config.in                       | 1 +
 package/libmicrohttpd/Config.in               | 1 +
 package/libsoup/Config.in                     | 1 +
 package/midori/Config.in                      | 1 +
 package/mpc/Config.in                         | 1 +
 package/mpfr/Config.in                        | 1 +
 package/nettle/Config.in                      | 1 +
 package/network-manager/Config.in             | 1 +
 package/nftables/Config.in                    | 1 +
 package/ntfs-3g/Config.in                     | 1 +
 package/openswan/Config.in                    | 1 +
 package/php/Config.ext                        | 1 +
 package/python-pycrypto/Config.in             | 1 +
 package/python-pysnmp-apps/Config.in          | 1 +
 package/python-pysnmp-mibs/Config.in          | 3 ++-
 package/python-pysnmp/Config.in               | 1 +
 package/samba4/Config.in                      | 1 +
 package/sconeserver/Config.in                 | 1 +
 package/strongswan/Config.in                  | 1 +
 25 files changed, 27 insertions(+), 1 deletion(-)
package/aiccu/Config.in +1 -0
index 4a0d20d..7bfdb96 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_AICCU
 	bool "aiccu"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gnutls
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU # fork()
package/connman/Config.in +1 -0
index ba238af..f891e3d 100644
@@ -31,6 +31,7 @@ config BR2_PACKAGE_CONNMAN_WIFI
 
 config BR2_PACKAGE_CONNMAN_WISPR
 	bool "enable WISPr support"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gnutls
 	select BR2_PACKAGE_GNUTLS
 	help
 	  Enable support for Wireless Internet Service Provider
package/dnsmasq/Config.in +1 -0
index 9e1c462..e1e3a82 100644
@@ -22,6 +22,7 @@ config BR2_PACKAGE_DNSMASQ_DHCP
 
 config BR2_PACKAGE_DNSMASQ_DNSSEC
 	bool "DNSSEC support"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gmp, nettle
 	select BR2_PACKAGE_GMP
 	select BR2_PACKAGE_NETTLE
 	help
package/gmp/Config.in +2 -0
index 226e088..b1f831e 100644
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_GMP
 	bool "gmp"
+	# gmplib not yet supported for MIPS R6
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6
 	help
 	  GNU Multiple Precision Arithmetic Library.
package/gnutls/Config.in +1 -0
index ecb6756..4ebba68 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_GNUTLS
 	bool "gnutls"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # nettle
 	select BR2_PACKAGE_NETTLE
 	select BR2_PACKAGE_PCRE
 	depends on BR2_USE_WCHAR
package/gstreamer1/gst1-plugins-bad/Config.in +1 -0
index f771401..694d5b7 100644
@@ -629,6 +629,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB
 
 config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS
 	bool "hls"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gnutls
 	select BR2_PACKAGE_GNUTLS
 	help
 	  Fragmented streaming plugins
package/guile/Config.in +1 -0
index d24f318..ed4e132 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_GUILE
 	bool "guile"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gmp
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_PACKAGE_LIBATOMIC_ARCH_SUPPORTS # bdwgc
 	depends on BR2_USE_WCHAR # libunistring
package/libmicrohttpd/Config.in +1 -0
index d9e6493..12add7b 100644
@@ -14,6 +14,7 @@ if BR2_PACKAGE_LIBMICROHTTPD
 
 config BR2_PACKAGE_LIBMICROHTTPD_SSL
 	bool "https support"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gnutls
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_GNUTLS
 	select BR2_PACKAGE_LIBGCRYPT
package/libsoup/Config.in +1 -0
index bc0ba95..16d4354 100644
@@ -22,6 +22,7 @@ config BR2_PACKAGE_LIBSOUP_GNOME
 
 config BR2_PACKAGE_LIBSOUP_SSL
 	bool "https support"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gnutls
 	select BR2_PACKAGE_GLIB_NETWORKING
 	select BR2_PACKAGE_GNUTLS
 	help
package/midori/Config.in +1 -0
index 11a2806..3147848 100644
@@ -28,6 +28,7 @@ if BR2_PACKAGE_MIDORI
 
 config BR2_PACKAGE_MIDORI_HTTPS
 	bool "HTTPS support"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gnutls
 	select BR2_PACKAGE_CA_CERTIFICATES # runtime
 	select BR2_PACKAGE_GLIB_NETWORKING
 	select BR2_PACKAGE_GNUTLS # for glib-networking
package/mpc/Config.in +1 -0
index 8377013..16c2e15 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_MPC
 	bool "mpc"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gmp, mpfr
 	select BR2_PACKAGE_MPFR
 	select BR2_PACKAGE_GMP
 	help
package/mpfr/Config.in +1 -0
index e02511f..13b0110 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_MPFR
 	bool "mpfr"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gmp
 	select BR2_PACKAGE_GMP
 	help
 	  C library for multiple-precision floating-point computations
package/nettle/Config.in +1 -0
index 5577621..e609344 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NETTLE
 	bool "nettle"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gmp
 	select BR2_PACKAGE_GMP
 	help
 	  Nettle is a cryptographic library that is designed to fit easily
package/network-manager/Config.in +1 -0
index 5a0e636..771633f 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NETWORK_MANAGER
 	bool "networkmanager"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gnutls
 	depends on BR2_USE_MMU # dbus
 	depends on BR2_PACKAGE_HAS_UDEV
 	# Tested with 3.2, but may even work with earlier versions
package/nftables/Config.in +1 -0
index 9b20b90..110e01c 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_NFTABLES
 	bool "nftables"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gmp
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
 	select BR2_PACKAGE_GMP
package/ntfs-3g/Config.in +1 -0
index d6d1481..f162f75 100644
@@ -18,6 +18,7 @@ if BR2_PACKAGE_NTFS_3G
 
 config BR2_PACKAGE_NTFS_3G_ENCRYPTED
 	bool "encrypted volumes"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gnutls
 	select BR2_PACKAGE_GNUTLS
 	select BR2_PACKAGE_LIBGCRYPT
 	help
package/openswan/Config.in +1 -0
index 0370143..6f0ccd0 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_OPENSWAN
 	bool "openswan"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gmp
 	depends on BR2_USE_MMU # iproute2
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # iproute2
 	select BR2_PACKAGE_GMP
package/php/Config.ext +1 -0
index 5324e79..48a3bdd 100644
@@ -244,6 +244,7 @@ config BR2_PACKAGE_PHP_EXT_BCMATH
 
 config BR2_PACKAGE_PHP_EXT_GMP
 	bool "GMP"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gmp
 	select BR2_PACKAGE_GMP
 	help
 	  GNU Multiple Precision support
package/python-pycrypto/Config.in +1 -0
index e998ecf..c471376 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_PYCRYPTO
 	bool "python-pycrypto"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gmp
 	select BR2_PACKAGE_GMP
 	help
 	  PyCrypto is a collection of cryptographic algorithms and
package/python-pysnmp-apps/Config.in +1 -0
index b032eba..9b4a95d 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_PYSNMP_APPS
 	bool "python-pysnmp-apps"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # python-pysnmp
 	select BR2_PACKAGE_PYTHON_PYSNMP
 	depends on BR2_INSTALL_LIBSTDCPP # pysnmp -> pyasn
 	help
package/python-pysnmp-mibs/Config.in +2 -1
index eca17d2..a84590d 100644
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_PYTHON_PYSNMP_MIBS
 	bool "python-pysnmp-mibs"
-	select BR2_PACKAGE_PYTHON_PYSNMP
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # python-pysnmp
 	depends on BR2_INSTALL_LIBSTDCPP # pysnmp -> pyasn
+	select BR2_PACKAGE_PYTHON_PYSNMP
 	help
 	  PySNMP MIBs is a set of IETF & IANA MIBs pre-compiled and
 	  packaged to simplify their use with the PySNMP library.
package/python-pysnmp/Config.in +1 -0
index c7cdf38..94f993d 100644
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_PYSNMP
 	bool "python-pysnmp"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # python-pycrypto
 	depends on BR2_INSTALL_LIBSTDCPP # pyasn
 	select BR2_PACKAGE_PYTHON_PYASN
 	select BR2_PACKAGE_PYTHON_PYCRYPTO
package/samba4/Config.in +1 -0
index 1411b08..4d65dd3 100644
@@ -30,6 +30,7 @@ if BR2_PACKAGE_SAMBA4
 
 config BR2_PACKAGE_SAMBA4_AD_DC
 	bool "AD DC"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gnutls
 	select BR2_PACKAGE_GNUTLS
 	help
 	  Enable Active Directory Domain Controller functionality.
package/sconeserver/Config.in +1 -0
index 4083aa7..0c1383e 100644
@@ -81,6 +81,7 @@ config BR2_PACKAGE_SCONESERVER_LETTUCE
 
 config BR2_PACKAGE_SCONESERVER_MATHS
 	bool "maths"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # mpfr
 	select BR2_PACKAGE_MPFR
 	help
 	  Mathematics module for Sconeserver
package/strongswan/Config.in +1 -0
index b26f1c7..2bd54c3 100644
@@ -36,6 +36,7 @@ config BR2_PACKAGE_STRONGSWAN_GCRYPT
 
 config BR2_PACKAGE_STRONGSWAN_GMP
 	bool "GNU MP (libgmp)"
+	depends on !BR2_mips_32r6 && !BR2_mips_64r6 # gmp
 	select BR2_PACKAGE_GMP
 
 endchoice
Signature · 1 line
2.4.10
#1 lore raw

PATCH 1/1 gmp: disable for MIPS R6

Quoted 6 lines · Vicente Olivert Riera

gmplib is not yet supported for MIPS R6, so disable it and also propagate that dependency recursively to all packages who select it.

Fixes:

   http://autobuild.buildroot.net/results/d06/d0686b3e7b8884f93034d4ea4b79fa8590ffa221/

Hi.
How about in package/gmp.mk:

ifeq ($(BR2_mips_32r6)$(BR2_mips_64r6),y)
GMP_CONF_OPTS += --disable-assembly
endif

(assuming it's the same for 64r6).
Sounds happier no? ;)
Regards.

author
#2 lore raw

PATCH 1/1 gmp: disable for MIPS R6

Dear Gustavo Zacarias,

Quoted 14 lines · Gustavo Zacarias
Quoted 8 lines · Vicente Olivert Riera

gmplib is not yet supported for MIPS R6, so disable it and also propagate that dependency recursively to all packages who select it.

Fixes:

http://autobuild.buildroot.net/results/d06/d0686b3e7b8884f93034d4ea4b79fa8590ffa221/

Hi.
How about in package/gmp.mk:

Quoted 6 lines

ifeq ($(BR2_mips_32r6)$(BR2_mips_64r6),y)
GMP_CONF_OPTS += --disable-assembly
endif

(assuming it's the same for 64r6).
Sounds happier no? ;)

I'm not an expert of gmplib and had no idea about that option. If it works, then it would be awesome. I'll try it.

Thanks!

Regards,

Vincent.

Quoted 1 line

Regards.

#3 lore raw

PATCH 1/1 gmp: disable for MIPS R6

In reply to Gustavo Zacarias

Gustavo, Vicente,

Quoted 7 lines · Gustavo Zacarias
Quoted 5 lines · Vicente Olivert Riera

gmplib is not yet supported for MIPS R6, so disable it and also propagate that dependency recursively to all packages who select it.

Fixes:

Quoted 8 lines
Quoted 1 line
   http://autobuild.buildroot.net/results/d06/d0686b3e7b8884f93034d4ea4b79fa8590ffa221/

Hi.
How about in package/gmp.mk:

ifeq ($(BR2_mips_32r6)$(BR2_mips_64r6),y)
GMP_CONF_OPTS += --disable-assembly
endif

If this works, sounds a *lot* better than duplicating the !mipsr6 dependency to zillions of packages.

Vicente ?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#4 lore raw

PATCH 1/1 gmp: disable for MIPS R6

Quoted 7 lines · Thomas Petazzoni
Quoted 6 lines

Hi.
How about in package/gmp.mk:

ifeq ($(BR2_mips_32r6)$(BR2_mips_64r6),y)
GMP_CONF_OPTS += --disable-assembly
endif

Quoted 6 lines

If this works, sounds a *lot* better than duplicating the !mipsr6 dependency to zillions of packages.

Vicente ?

Thomas

Hi.
Already sent a patch and build-tested for both 32r6 & 64r6. That codepath is used for architectures that don't have assembly-optimized routines, so it's pretty safe. Slower of course, but better than nothing.
Regards.

author
#5 lore raw

PATCH 1/1 gmp: disable for MIPS R6

In reply to Thomas Petazzoni

Dear Thomas Petazzoni,

Quoted 15 lines · Thomas Petazzoni

Gustavo, Vicente,

Quoted 12 lines · Gustavo Zacarias
Quoted 6 lines · Vicente Olivert Riera

gmplib is not yet supported for MIPS R6, so disable it and also propagate that dependency recursively to all packages who select it.

Fixes:

   http://autobuild.buildroot.net/results/d06/d0686b3e7b8884f93034d4ea4b79fa8590ffa221/

Hi.
How about in package/gmp.mk:

Quoted 8 lines
Quoted 3 lines

ifeq ($(BR2_mips_32r6)$(BR2_mips_64r6),y)
GMP_CONF_OPTS += --disable-assembly
endif

If this works, sounds a *lot* better than duplicating the !mipsr6 dependency to zillions of packages.

Vicente ?

Indeed, I already replied to Gustavo as well.

I'm testing the patch right now, and if it works, I'll mark mine as superseded.

Regards,

Vincent.

Quoted 2 lines

Thomas