| Message ID | 20240407192944.3335886-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/opensc: openssl is optional, not mandatory | expand |
On 07/04/2024 21:29, Fabrice Fontaine wrote: > openssl is optional, not mandatory since the addition of the package in > commit 8aaa7ecbce1d10cbcd880c3da5e429988f96176a > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Applied to master, thanks. Regards, Arnout > --- > package/opensc/Config.in | 1 - > package/opensc/opensc.mk | 9 ++++++++- > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/package/opensc/Config.in b/package/opensc/Config.in > index 8c6a95a41d..13b085f389 100644 > --- a/package/opensc/Config.in > +++ b/package/opensc/Config.in > @@ -5,7 +5,6 @@ config BR2_PACKAGE_OPENSC > depends on BR2_USE_MMU # fork() > depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pcsc-lite > select BR2_PACKAGE_PCSC_LITE > - select BR2_PACKAGE_OPENSSL > select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL > select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL > help > diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk > index aa82bd18da..f4dc2206ea 100644 > --- a/package/opensc/opensc.mk > +++ b/package/opensc/opensc.mk > @@ -9,8 +9,15 @@ OPENSC_SITE = https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSIO > OPENSC_LICENSE = LGPL-2.1+ > OPENSC_LICENSE_FILES = COPYING > OPENSC_CPE_ID_VALID = YES > -OPENSC_DEPENDENCIES = openssl pcsc-lite > +OPENSC_DEPENDENCIES = pcsc-lite > OPENSC_INSTALL_STAGING = YES > OPENSC_CONF_OPTS = --disable-cmocka --disable-strict --disable-tests > > +ifeq ($(BR2_PACKAGE_OPENSSL),y) > +OPENSC_DEPENDENCIES += openssl > +OPENSC_CONF_OPTS += --enable-openssl > +else > +OPENSC_CONF_OPTS += --disable-openssl > +endif > + > $(eval $(autotools-package))
diff --git a/package/opensc/Config.in b/package/opensc/Config.in index 8c6a95a41d..13b085f389 100644 --- a/package/opensc/Config.in +++ b/package/opensc/Config.in @@ -5,7 +5,6 @@ config BR2_PACKAGE_OPENSC depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # pcsc-lite select BR2_PACKAGE_PCSC_LITE - select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_DES if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBOPENSSL_ENABLE_RMD160 if BR2_PACKAGE_LIBOPENSSL help diff --git a/package/opensc/opensc.mk b/package/opensc/opensc.mk index aa82bd18da..f4dc2206ea 100644 --- a/package/opensc/opensc.mk +++ b/package/opensc/opensc.mk @@ -9,8 +9,15 @@ OPENSC_SITE = https://github.com/OpenSC/OpenSC/releases/download/$(OPENSC_VERSIO OPENSC_LICENSE = LGPL-2.1+ OPENSC_LICENSE_FILES = COPYING OPENSC_CPE_ID_VALID = YES -OPENSC_DEPENDENCIES = openssl pcsc-lite +OPENSC_DEPENDENCIES = pcsc-lite OPENSC_INSTALL_STAGING = YES OPENSC_CONF_OPTS = --disable-cmocka --disable-strict --disable-tests +ifeq ($(BR2_PACKAGE_OPENSSL),y) +OPENSC_DEPENDENCIES += openssl +OPENSC_CONF_OPTS += --enable-openssl +else +OPENSC_CONF_OPTS += --disable-openssl +endif + $(eval $(autotools-package))
openssl is optional, not mandatory since the addition of the package in commit 8aaa7ecbce1d10cbcd880c3da5e429988f96176a Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/opensc/Config.in | 1 - package/opensc/opensc.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-)