Skip to contentSkip to conversation

package/nftables: use --with-mini-gmp when gmp is not selected

PATCH New Adrien Gallouët 2 participants 3 messages Apr 17, 2020 – Apr 20, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/nftables: use --with-mini-gmp when gmp is not selected

---
 package/nftables/Config.in   | 1 -
 package/nftables/nftables.mk | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
package/nftables/Config.in +0 -1
index 6452ab4f52..8d172b7256 100644
@@ -2,7 +2,6 @@ config BR2_PACKAGE_NFTABLES
 	bool "nftables"
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
-	select BR2_PACKAGE_GMP
 	select BR2_PACKAGE_LIBMNL
 	select BR2_PACKAGE_LIBNFTNL
 	help
package/nftables/nftables.mk +7 -1
index 210e950c11..1fac9dd3bf 100644
@@ -7,12 +7,18 @@
 NFTABLES_VERSION = 0.9.3
 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2
 NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files
-NFTABLES_DEPENDENCIES = gmp libmnl libnftnl host-bison host-flex \
+NFTABLES_DEPENDENCIES = libmnl libnftnl host-bison host-flex \
 	host-pkgconf $(TARGET_NLS_DEPENDENCIES)
 NFTABLES_LICENSE = GPL-2.0
 NFTABLES_LICENSE_FILES = COPYING
 NFTABLES_CONF_OPTS = --disable-man-doc --disable-pdf-doc
 
+ifeq ($(BR2_PACKAGE_GMP),y)
+NFTABLES_DEPENDENCIES += gmp
+else
+NFTABLES_CONF_OPTS += --with-mini-gmp
+endif
+
 ifeq ($(BR2_PACKAGE_READLINE),y)
 NFTABLES_DEPENDENCIES += readline
 NFTABLES_LIBS += -lncurses
Signature · 1 line
2.25.2
#1 lore raw

PATCH 1/1 package/nftables: use --with-mini-gmp when gmp is not selected

Adrien, All,

On 2020-04-17 13:36 +0000, Adrien Gallou?t spake thusly:

Quoted 1 line

Applied to master with two small changes:
- explicitly disable mini-gmp when full one is enabled
- reword and extend commit log

Thanks!

Regards,
Yann E. MORIN.

Quoted 48 lines
---
 package/nftables/Config.in   | 1 -
 package/nftables/nftables.mk | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
package/nftables/Config.in +0 -1
index 6452ab4f52..8d172b7256 100644
@@ -2,7 +2,6 @@ config BR2_PACKAGE_NFTABLES
 	bool "nftables"
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
-	select BR2_PACKAGE_GMP
 	select BR2_PACKAGE_LIBMNL
 	select BR2_PACKAGE_LIBNFTNL
 	help
package/nftables/nftables.mk +7 -1
index 210e950c11..1fac9dd3bf 100644
@@ -7,12 +7,18 @@
 NFTABLES_VERSION = 0.9.3
 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2
 NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files
-NFTABLES_DEPENDENCIES = gmp libmnl libnftnl host-bison host-flex \
+NFTABLES_DEPENDENCIES = libmnl libnftnl host-bison host-flex \
 	host-pkgconf $(TARGET_NLS_DEPENDENCIES)
 NFTABLES_LICENSE = GPL-2.0
 NFTABLES_LICENSE_FILES = COPYING
 NFTABLES_CONF_OPTS = --disable-man-doc --disable-pdf-doc
 
+ifeq ($(BR2_PACKAGE_GMP),y)
+NFTABLES_DEPENDENCIES += gmp
+else
+NFTABLES_CONF_OPTS += --with-mini-gmp
+endif
+
 ifeq ($(BR2_PACKAGE_READLINE),y)
 NFTABLES_DEPENDENCIES += readline
 NFTABLES_LIBS += -lncurses
Signature · 6 lines
2.25.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 package/nftables: use --with-mini-gmp when gmp is not selected

Quoted 11 lines · Yann E. MORIN

Adrien, All,

On 2020-04-17 13:36 +0000, Adrien Gallou?t spake thusly:

Quoted 1 line

Applied to master with two small changes:
- explicitly disable mini-gmp when full one is enabled
- reword and extend commit log

Thanks!

Thanks to you :)

Quoted 48 lines

Regards,
Yann E. MORIN.

Quoted 44 lines
---
 package/nftables/Config.in   | 1 -
 package/nftables/nftables.mk | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)
package/nftables/Config.in +0 -1
index 6452ab4f52..8d172b7256 100644
@@ -2,7 +2,6 @@ config BR2_PACKAGE_NFTABLES
      bool "nftables"
      depends on BR2_USE_WCHAR
      depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
-     select BR2_PACKAGE_GMP
      select BR2_PACKAGE_LIBMNL
      select BR2_PACKAGE_LIBNFTNL
      help
package/nftables/nftables.mk +7 -2
index 210e950c11..1fac9dd3bf 100644
@@ -7,12 +7,18 @@
 NFTABLES_VERSION = 0.9.3
 NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2
 NFTABLES_SITE = https://www.netfilter.org/projects/nftables/files
-NFTABLES_DEPENDENCIES = gmp libmnl libnftnl host-bison host-flex \
+NFTABLES_DEPENDENCIES = libmnl libnftnl host-bison host-flex \
      host-pkgconf $(TARGET_NLS_DEPENDENCIES)
 NFTABLES_LICENSE = GPL-2.0
 NFTABLES_LICENSE_FILES = COPYING
 NFTABLES_CONF_OPTS = --disable-man-doc --disable-pdf-doc
 
+ifeq ($(BR2_PACKAGE_GMP),y)
+NFTABLES_DEPENDENCIES += gmp
+else
+NFTABLES_CONF_OPTS += --with-mini-gmp
+endif
+
 ifeq ($(BR2_PACKAGE_READLINE),y)
 NFTABLES_DEPENDENCIES += readline
 NFTABLES_LIBS += -lncurses
--

2.25.2

Quoted 7 lines
Quoted 4 lines

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot

--

.-----------------.--------------------.------------------.--------------------.

Quoted 1 line

| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics'

conspiracy: |

Quoted 1 line

| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___

      |
Quoted 1 line

| +33 561 099 427 `------------.-------: X AGAINST | \e/ There

is no |

Quoted 1 line

| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v

conspiracy. |

Quoted 1 line

'------------------------------^-------^------------------^--------------------' -------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200420/6fd3445e/attachment.html>