Message ID | 20200330234616.1665466-1-aduskett@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [1/5] package/nftables: check for python | expand |
Adam, All, On 2020-03-30 16:46 -0700, aduskett@gmail.com spake thusly: > From: Adam Duskett <Aduskett@gmail.com> > > If python or python3 is selected, nftables should depend on the package > and set the --enable-python option, otherwise set --disable-python > > Signed-off-by: Adam Duskett <Aduskett@gmail.com> This one patch applied to master, thanks. Regards, Yann E. MORIN. > --- > package/nftables/nftables.mk | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk > index 11ef6844ce..210e950c11 100644 > --- a/package/nftables/nftables.mk > +++ b/package/nftables/nftables.mk > @@ -27,6 +27,13 @@ else > NFTABLES_CONF_OPTS += --without-json > endif > > +ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) > +NFTABLES_CONF_OPTS += --enable-python > +NFTABLES_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) > +else > +NFTABLES_CONF_OPTS += --disable-python > +endif > + > ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_JSON),yy) > NFTABLES_LIBS += -ljansson -lm > endif > -- > 2.25.1 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "aduskett" == aduskett <aduskett@gmail.com> writes: > From: Adam Duskett <Aduskett@gmail.com> > If python or python3 is selected, nftables should depend on the package > and set the --enable-python option, otherwise set --disable-python > Signed-off-by: Adam Duskett <Aduskett@gmail.com> Committed to 2020.02.x, thanks.
diff --git a/package/nftables/nftables.mk b/package/nftables/nftables.mk index 11ef6844ce..210e950c11 100644 --- a/package/nftables/nftables.mk +++ b/package/nftables/nftables.mk @@ -27,6 +27,13 @@ else NFTABLES_CONF_OPTS += --without-json endif +ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) +NFTABLES_CONF_OPTS += --enable-python +NFTABLES_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) +else +NFTABLES_CONF_OPTS += --disable-python +endif + ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_JSON),yy) NFTABLES_LIBS += -ljansson -lm endif