All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/nftables: use --with-mini-gmp when gmp is not selected
@ 2020-04-17 13:36 Adrien Gallouët
  2020-04-19 22:00 ` Yann E. MORIN
  0 siblings, 1 reply; 3+ messages in thread
From: Adrien Gallouët @ 2020-04-17 13:36 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Adrien Gallou?t <adrien@gallouet.fr>
---
 package/nftables/Config.in   | 1 -
 package/nftables/nftables.mk | 8 +++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/nftables/Config.in b/package/nftables/Config.in
index 6452ab4f52..8d172b7256 100644
--- a/package/nftables/Config.in
+++ b/package/nftables/Config.in
@@ -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
diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk
index 210e950c11..1fac9dd3bf 100644
--- a/package/nftables/nftables.mk
+++ b/package/nftables/nftables.mk
@@ -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

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/nftables: use --with-mini-gmp when gmp is not selected
  2020-04-17 13:36 [Buildroot] [PATCH 1/1] package/nftables: use --with-mini-gmp when gmp is not selected Adrien Gallouët
@ 2020-04-19 22:00 ` Yann E. MORIN
  2020-04-20  7:52   ` Adrien Gallouët
  0 siblings, 1 reply; 3+ messages in thread
From: Yann E. MORIN @ 2020-04-19 22:00 UTC (permalink / raw)
  To: buildroot

Adrien, All,

On 2020-04-17 13:36 +0000, Adrien Gallou?t spake thusly:
> Signed-off-by: Adrien Gallou?t <adrien@gallouet.fr>

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.

> ---
>  package/nftables/Config.in   | 1 -
>  package/nftables/nftables.mk | 8 +++++++-
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/package/nftables/Config.in b/package/nftables/Config.in
> index 6452ab4f52..8d172b7256 100644
> --- a/package/nftables/Config.in
> +++ b/package/nftables/Config.in
> @@ -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
> diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk
> index 210e950c11..1fac9dd3bf 100644
> --- a/package/nftables/nftables.mk
> +++ b/package/nftables/nftables.mk
> @@ -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
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] package/nftables: use --with-mini-gmp when gmp is not selected
  2020-04-19 22:00 ` Yann E. MORIN
@ 2020-04-20  7:52   ` Adrien Gallouët
  0 siblings, 0 replies; 3+ messages in thread
From: Adrien Gallouët @ 2020-04-20  7:52 UTC (permalink / raw)
  To: buildroot

On Mon, Apr 20, 2020 at 12:00 AM Yann E. MORIN <yann.morin.1998@free.fr>
wrote:
>
> Adrien, All,
>
> On 2020-04-17 13:36 +0000, Adrien Gallou?t spake thusly:
> > Signed-off-by: Adrien Gallou?t <adrien@gallouet.fr>
>
> 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 :)

>
> Regards,
> Yann E. MORIN.
>
> > ---
> >  package/nftables/Config.in   | 1 -
> >  package/nftables/nftables.mk | 8 +++++++-
> >  2 files changed, 7 insertions(+), 2 deletions(-)
> >
> > diff --git a/package/nftables/Config.in b/package/nftables/Config.in
> > index 6452ab4f52..8d172b7256 100644
> > --- a/package/nftables/Config.in
> > +++ b/package/nftables/Config.in
> > @@ -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
> > diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk
> > index 210e950c11..1fac9dd3bf 100644
> > --- a/package/nftables/nftables.mk
> > +++ b/package/nftables/nftables.mk
> > @@ -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
> >
> > _______________________________________________
> > buildroot mailing list
> > buildroot at busybox.net
> > http://lists.busybox.net/mailman/listinfo/buildroot
>
> --
>
.-----------------.--------------------.------------------.--------------------.
> |  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.  |
>
'------------------------------^-------^------------------^--------------------'
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200420/6fd3445e/attachment.html>

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-04-20  7:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-17 13:36 [Buildroot] [PATCH 1/1] package/nftables: use --with-mini-gmp when gmp is not selected Adrien Gallouët
2020-04-19 22:00 ` Yann E. MORIN
2020-04-20  7:52   ` Adrien Gallouët

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.