diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2018-05-07 00:09:01 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-05-08 15:23:14 +0200 |
| commit | f64211501d42a33ddf3a2dffee24d620ed24cd5f (patch) | |
| tree | 9ee3b6ba08ea98765613238fbef6bdb547a0a59f /package/libkcapi | |
| parent | 9d2ab8a5969bf35be8c334892a656d7cc7a10672 (diff) | |
| download | buildroot-f64211501d42a33ddf3a2dffee24d620ed24cd5f.tar.gz buildroot-f64211501d42a33ddf3a2dffee24d620ed24cd5f.zip | |
libkcapi: split BR2_PACKAGE_LIBKCAPI_APPS
Since commit https://github.com/smuellerDD/libkcapi/commit/af313accf18887b4f6dbd7306c2389ddf271c9b7,
hasher test application depends on dlfcn.h. To avoid putting all apps
under !BR2_STATIC_LIBS dependency, split BR2_PACKAGE_LIBKCAPI_APPS into
several variables.
Moreover, BR2_USE_MMU is only a dependency of BR2_PACKAGE_LIBKCAPI_TEST
as other applications don't use fork.
Finally, enc or dgst applications could be enabled in a next patch if
needed.
Fixes:
- http://autobuild.buildroot.net/results/7c57f3025030eff41a5cde52759821249859caf1
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/libkcapi')
| -rw-r--r-- | package/libkcapi/Config.in | 20 | ||||
| -rw-r--r-- | package/libkcapi/libkcapi.mk | 32 |
2 files changed, 36 insertions, 16 deletions
diff --git a/package/libkcapi/Config.in b/package/libkcapi/Config.in index 2b981777e6..7397cfe800 100644 --- a/package/libkcapi/Config.in +++ b/package/libkcapi/Config.in @@ -7,11 +7,21 @@ config BR2_PACKAGE_LIBKCAPI if BR2_PACKAGE_LIBKCAPI -config BR2_PACKAGE_LIBKCAPI_APPS - bool "build test applications" +config BR2_PACKAGE_LIBKCAPI_HASHER + bool "build hasher application" + depends on !BR2_STATIC_LIBS # dlfcn.h + +comment "hasher application needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + +config BR2_PACKAGE_LIBKCAPI_RNGAPP + bool "build rng read application" + +config BR2_PACKAGE_LIBKCAPI_SPEED + bool "build speed-test program" + +config BR2_PACKAGE_LIBKCAPI_TEST + bool "build test program" depends on BR2_USE_MMU # fork() - help - Build additional test applications that can provide - performance or algorithm tests. endif diff --git a/package/libkcapi/libkcapi.mk b/package/libkcapi/libkcapi.mk index 44469017df..1a45f4f996 100644 --- a/package/libkcapi/libkcapi.mk +++ b/package/libkcapi/libkcapi.mk @@ -12,18 +12,28 @@ LIBKCAPI_INSTALL_STAGING = YES LIBKCAPI_LICENSE = BSD-3-Clause (library), BSD-3-Clause or GPL-2.0 (programs) LIBKCAPI_LICENSE_FILES = COPYING COPYING.gplv2 COPYING.bsd -ifeq ($(BR2_PACKAGE_LIBKCAPI_APPS),y) -LIBKCAPI_CONF_OPTS += \ - --enable-kcapi-speed \ - --enable-kcapi-test \ - --enable-kcapi-hasher \ - --enable-kcapi-rngapp +ifeq ($(BR2_PACKAGE_LIBKCAPI_HASHER),y) +LIBKCAPI_CONF_OPTS += --enable-kcapi-hasher else -LIBKCAPI_CONF_OPTS += \ - --disable-kcapi-speed \ - --disable-kcapi-test \ - --disable-kcapi-hasher \ - --disable-kcapi-rngapp +LIBKCAPI_CONF_OPTS += --disable-kcapi-hasher +endif + +ifeq ($(BR2_PACKAGE_LIBKCAPI_RNGAPP),y) +LIBKCAPI_CONF_OPTS += --enable-kcapi-rngapp +else +LIBKCAPI_CONF_OPTS += --disable-kcapi-rngapp +endif + +ifeq ($(BR2_PACKAGE_LIBKCAPI_SPEED),y) +LIBKCAPI_CONF_OPTS += --enable-kcapi-speed +else +LIBKCAPI_CONF_OPTS += --disable-kcapi-speed +endif + +ifeq ($(BR2_PACKAGE_LIBKCAPI_TEST),y) +LIBKCAPI_CONF_OPTS += --enable-kcapi-test +else +LIBKCAPI_CONF_OPTS += --disable-kcapi-test endif $(eval $(autotools-package)) |
