* [Buildroot] [PATCH 1/3] package/p11-kit: libffi is optional, not mandatory
@ 2020-12-21 12:20 Fabrice Fontaine
2020-12-21 12:20 ` [Buildroot] [PATCH 2/3] package/p11-kit: libtasn1 " Fabrice Fontaine
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2020-12-21 12:20 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/p11-kit/Config.in | 1 -
package/p11-kit/p11-kit.mk | 9 ++++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/package/p11-kit/Config.in b/package/p11-kit/Config.in
index a6b7261886..5690418756 100644
--- a/package/p11-kit/Config.in
+++ b/package/p11-kit/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_P11_KIT
depends on !BR2_STATIC_LIBS
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_THREADS
- select BR2_PACKAGE_LIBFFI
select BR2_PACKAGE_LIBTASN1
help
Provides a way to load and enumerate PKCS#11 modules.
diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk
index 1f72e0515b..f67e57102b 100644
--- a/package/p11-kit/p11-kit.mk
+++ b/package/p11-kit/p11-kit.mk
@@ -6,7 +6,7 @@
P11_KIT_VERSION = 0.23.16.1
P11_KIT_SITE = https://github.com/p11-glue/p11-kit/releases/download/$(P11_KIT_VERSION)
-P11_KIT_DEPENDENCIES = host-pkgconf libffi libtasn1
+P11_KIT_DEPENDENCIES = host-pkgconf libtasn1
P11_KIT_INSTALL_STAGING = YES
P11_KIT_CONF_OPTS = --disable-static
P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \
@@ -20,4 +20,11 @@ else
P11_KIT_CONF_OPTS += --without-trust-paths
endif
+ifeq ($(BR2_PACKAGE_LIBFFI),y)
+P11_KIT_DEPENDENCIES = host-pkgconf libffi
+P11_KIT_CONF_OPTS += --with-libffi
+else
+P11_KIT_CONF_OPTS += --without-libffi
+endif
+
$(eval $(autotools-package))
--
2.29.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/3] package/p11-kit: libtasn1 is optional, not mandatory
2020-12-21 12:20 [Buildroot] [PATCH 1/3] package/p11-kit: libffi is optional, not mandatory Fabrice Fontaine
@ 2020-12-21 12:20 ` Fabrice Fontaine
2020-12-21 12:30 ` Baruch Siach
2020-12-21 12:20 ` [Buildroot] [PATCH 3/3] package/p11-kit: add systemd optional dependency Fabrice Fontaine
2020-12-21 12:29 ` [Buildroot] [PATCH 1/3] package/p11-kit: libffi is optional, not mandatory Baruch Siach
2 siblings, 1 reply; 5+ messages in thread
From: Fabrice Fontaine @ 2020-12-21 12:20 UTC (permalink / raw)
To: buildroot
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/p11-kit/Config.in | 1 -
package/p11-kit/p11-kit.mk | 8 +++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/package/p11-kit/Config.in b/package/p11-kit/Config.in
index 5690418756..9be76c2f41 100644
--- a/package/p11-kit/Config.in
+++ b/package/p11-kit/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_P11_KIT
depends on !BR2_STATIC_LIBS
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_HAS_THREADS
- select BR2_PACKAGE_LIBTASN1
help
Provides a way to load and enumerate PKCS#11 modules.
Provides a standard configuration setup for installing PKCS#11
diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk
index f67e57102b..c2c6b2ab79 100644
--- a/package/p11-kit/p11-kit.mk
+++ b/package/p11-kit/p11-kit.mk
@@ -6,7 +6,6 @@
P11_KIT_VERSION = 0.23.16.1
P11_KIT_SITE = https://github.com/p11-glue/p11-kit/releases/download/$(P11_KIT_VERSION)
-P11_KIT_DEPENDENCIES = host-pkgconf libtasn1
P11_KIT_INSTALL_STAGING = YES
P11_KIT_CONF_OPTS = --disable-static
P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \
@@ -27,4 +26,11 @@ else
P11_KIT_CONF_OPTS += --without-libffi
endif
+ifeq ($(BR2_PACKAGE_LIBTASN1),y)
+P11_KIT_DEPENDENCIES = host-pkgconf libtasn1
+P11_KIT_CONF_OPTS += --with-libtasn1
+else
+P11_KIT_CONF_OPTS += --without-libtasn1
+endif
+
$(eval $(autotools-package))
--
2.29.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 3/3] package/p11-kit: add systemd optional dependency
2020-12-21 12:20 [Buildroot] [PATCH 1/3] package/p11-kit: libffi is optional, not mandatory Fabrice Fontaine
2020-12-21 12:20 ` [Buildroot] [PATCH 2/3] package/p11-kit: libtasn1 " Fabrice Fontaine
@ 2020-12-21 12:20 ` Fabrice Fontaine
2020-12-21 12:29 ` [Buildroot] [PATCH 1/3] package/p11-kit: libffi is optional, not mandatory Baruch Siach
2 siblings, 0 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2020-12-21 12:20 UTC (permalink / raw)
To: buildroot
systemd is an optional dependency (enabled by default) since version
0.23.13 and
https://github.com/p11-glue/p11-kit/commit/53a7e915b2694bc1957d98493a7aee9abfa3c6c5
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/p11-kit/p11-kit.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk
index c2c6b2ab79..c90ed39f7e 100644
--- a/package/p11-kit/p11-kit.mk
+++ b/package/p11-kit/p11-kit.mk
@@ -33,4 +33,11 @@ else
P11_KIT_CONF_OPTS += --without-libtasn1
endif
+ifeq ($(BR2_PACKAGE_SYSTEMD),y)
+P11_KIT_DEPENDENCIES = host-pkgconf systemd
+P11_KIT_CONF_OPTS += --with-systemd
+else
+P11_KIT_CONF_OPTS += --without-systemd
+endif
+
$(eval $(autotools-package))
--
2.29.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/3] package/p11-kit: libffi is optional, not mandatory
2020-12-21 12:20 [Buildroot] [PATCH 1/3] package/p11-kit: libffi is optional, not mandatory Fabrice Fontaine
2020-12-21 12:20 ` [Buildroot] [PATCH 2/3] package/p11-kit: libtasn1 " Fabrice Fontaine
2020-12-21 12:20 ` [Buildroot] [PATCH 3/3] package/p11-kit: add systemd optional dependency Fabrice Fontaine
@ 2020-12-21 12:29 ` Baruch Siach
2 siblings, 0 replies; 5+ messages in thread
From: Baruch Siach @ 2020-12-21 12:29 UTC (permalink / raw)
To: buildroot
Hi Fabrice,
On Mon, Dec 21 2020, Fabrice Fontaine wrote:
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/p11-kit/Config.in | 1 -
> package/p11-kit/p11-kit.mk | 9 ++++++++-
> 2 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/package/p11-kit/Config.in b/package/p11-kit/Config.in
> index a6b7261886..5690418756 100644
> --- a/package/p11-kit/Config.in
> +++ b/package/p11-kit/Config.in
> @@ -3,7 +3,6 @@ config BR2_PACKAGE_P11_KIT
> depends on !BR2_STATIC_LIBS
> depends on BR2_USE_MMU
> depends on BR2_TOOLCHAIN_HAS_THREADS
> - select BR2_PACKAGE_LIBFFI
> select BR2_PACKAGE_LIBTASN1
> help
> Provides a way to load and enumerate PKCS#11 modules.
> diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk
> index 1f72e0515b..f67e57102b 100644
> --- a/package/p11-kit/p11-kit.mk
> +++ b/package/p11-kit/p11-kit.mk
> @@ -6,7 +6,7 @@
>
> P11_KIT_VERSION = 0.23.16.1
> P11_KIT_SITE = https://github.com/p11-glue/p11-kit/releases/download/$(P11_KIT_VERSION)
> -P11_KIT_DEPENDENCIES = host-pkgconf libffi libtasn1
> +P11_KIT_DEPENDENCIES = host-pkgconf libtasn1
> P11_KIT_INSTALL_STAGING = YES
> P11_KIT_CONF_OPTS = --disable-static
> P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \
> @@ -20,4 +20,11 @@ else
> P11_KIT_CONF_OPTS += --without-trust-paths
> endif
>
> +ifeq ($(BR2_PACKAGE_LIBFFI),y)
> +P11_KIT_DEPENDENCIES = host-pkgconf libffi
This overwrites the libtasn1 dependency. Maybe use += instead?
baruch
> +P11_KIT_CONF_OPTS += --with-libffi
> +else
> +P11_KIT_CONF_OPTS += --without-libffi
> +endif
> +
> $(eval $(autotools-package))
--
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/3] package/p11-kit: libtasn1 is optional, not mandatory
2020-12-21 12:20 ` [Buildroot] [PATCH 2/3] package/p11-kit: libtasn1 " Fabrice Fontaine
@ 2020-12-21 12:30 ` Baruch Siach
0 siblings, 0 replies; 5+ messages in thread
From: Baruch Siach @ 2020-12-21 12:30 UTC (permalink / raw)
To: buildroot
Hi Fabrice,
On Mon, Dec 21 2020, Fabrice Fontaine wrote:
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/p11-kit/Config.in | 1 -
> package/p11-kit/p11-kit.mk | 8 +++++++-
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/package/p11-kit/Config.in b/package/p11-kit/Config.in
> index 5690418756..9be76c2f41 100644
> --- a/package/p11-kit/Config.in
> +++ b/package/p11-kit/Config.in
> @@ -3,7 +3,6 @@ config BR2_PACKAGE_P11_KIT
> depends on !BR2_STATIC_LIBS
> depends on BR2_USE_MMU
> depends on BR2_TOOLCHAIN_HAS_THREADS
> - select BR2_PACKAGE_LIBTASN1
> help
> Provides a way to load and enumerate PKCS#11 modules.
> Provides a standard configuration setup for installing PKCS#11
> diff --git a/package/p11-kit/p11-kit.mk b/package/p11-kit/p11-kit.mk
> index f67e57102b..c2c6b2ab79 100644
> --- a/package/p11-kit/p11-kit.mk
> +++ b/package/p11-kit/p11-kit.mk
> @@ -6,7 +6,6 @@
>
> P11_KIT_VERSION = 0.23.16.1
> P11_KIT_SITE = https://github.com/p11-glue/p11-kit/releases/download/$(P11_KIT_VERSION)
> -P11_KIT_DEPENDENCIES = host-pkgconf libtasn1
> P11_KIT_INSTALL_STAGING = YES
> P11_KIT_CONF_OPTS = --disable-static
> P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \
> @@ -27,4 +26,11 @@ else
> P11_KIT_CONF_OPTS += --without-libffi
> endif
>
> +ifeq ($(BR2_PACKAGE_LIBTASN1),y)
> +P11_KIT_DEPENDENCIES = host-pkgconf libtasn1
Once again this overwrites the dependencies set in the libffi case
above.
baruch
> +P11_KIT_CONF_OPTS += --with-libtasn1
> +else
> +P11_KIT_CONF_OPTS += --without-libtasn1
> +endif
> +
> $(eval $(autotools-package))
--
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-12-21 12:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-21 12:20 [Buildroot] [PATCH 1/3] package/p11-kit: libffi is optional, not mandatory Fabrice Fontaine
2020-12-21 12:20 ` [Buildroot] [PATCH 2/3] package/p11-kit: libtasn1 " Fabrice Fontaine
2020-12-21 12:30 ` Baruch Siach
2020-12-21 12:20 ` [Buildroot] [PATCH 3/3] package/p11-kit: add systemd optional dependency Fabrice Fontaine
2020-12-21 12:29 ` [Buildroot] [PATCH 1/3] package/p11-kit: libffi is optional, not mandatory Baruch Siach
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox