package/p11-kit: libffi is optional, not mandatory
PATCH 1/3 package/p11-kit: libffi is optional, not mandatory
Signed-off-by Fabrice Fontaine <[email protected]>
--- package/p11-kit/Config.in | 1 - package/p11-kit/p11-kit.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-)
package/p11-kit/Config.in +0 -1
@@ -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.
package/p11-kit/p11-kit.mk +8 -1
@@ -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))
Signature · 1 line
2.29.2
PATCH 2/3 package/p11-kit: libtasn1 is optional, not mandatory
Signed-off-by Fabrice Fontaine <[email protected]>
--- package/p11-kit/Config.in | 1 - package/p11-kit/p11-kit.mk | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-)
package/p11-kit/Config.in +0 -1
@@ -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
package/p11-kit/p11-kit.mk +7 -1
@@ -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))
Signature · 1 line
2.29.2
PATCH 2/3 package/p11-kit: libtasn1 is optional, not mandatory
Hi Fabrice,
Quoted 31 lines · Fabrice Fontaine
Signed-off-by Fabrice Fontaine <[email protected]>--- package/p11-kit/Config.in | 1 - package/p11-kit/p11-kit.mk | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-)package/p11-kit/Config.in +0
-1@@ -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#11package/p11-kit/p11-kit.mk +0
-1@@ -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 \
package/p11-kit/p11-kit.mk else · line 30
Quoted 5 lines
package/p11-kit/p11-kit.mk +2
-0@@ -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
Quoted 6 lines
package/p11-kit/p11-kit.mk +5
-0+P11_KIT_CONF_OPTS += --with-libtasn1 +else +P11_KIT_CONF_OPTS += --without-libtasn1 +endif + $(eval $(autotools-package))
Signature · 3 lines
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -PATCH 3/3 package/p11-kit: add systemd optional dependency
In reply to Fabrice Fontainesystemd 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 <[email protected]>
--- package/p11-kit/p11-kit.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/p11-kit/p11-kit.mk +7 -0
@@ -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))
Signature · 1 line
2.29.2
PATCH 1/3 package/p11-kit: libffi is optional, not mandatory
In reply to Fabrice FontaineHi Fabrice,
Quoted 32 lines · Fabrice Fontaine
Signed-off-by Fabrice Fontaine <[email protected]>--- package/p11-kit/Config.in | 1 - package/p11-kit/p11-kit.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-)package/p11-kit/Config.in +0
-1@@ -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.package/p11-kit/p11-kit.mk +1
-1@@ -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 \
package/p11-kit/p11-kit.mk else · line 24
Quoted 5 lines
package/p11-kit/p11-kit.mk +2
-0@@ -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
Quoted 6 lines
package/p11-kit/p11-kit.mk +5
-0+P11_KIT_CONF_OPTS += --with-libffi +else +P11_KIT_CONF_OPTS += --without-libffi +endif + $(eval $(autotools-package))
Signature · 3 lines
~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -