| Message ID | ZsM3ZxeXudm/p3Jf@waldemar-brodkorb.de |
|---|---|
| State | Accepted |
| Headers | show |
| Series | package/strongswan: fix wolfssl compile issue | expand |
On Mon, 19 Aug 2024 14:15:35 +0200 Waldemar Brodkorb <wbx@openadk.org> wrote: > Disable RNG support so that following build failure does not happen: > In file included from ../../../../src/libstrongswan/plugins/plugin.h:28, > from wolfssl_plugin.h:34, > from wolfssl_plugin.c:29: > wolfssl_plugin.c: In function 'get_features': > ../../../../src/libstrongswan/plugins/plugin_feature.h:321:119: error: 'FEATURE_WC_RNG' undeclared (first use in this function); did you mean 'FEATURE_RNG'? > 321 | #define __PLUGIN_FEATURE_REGISTER(type, _f) (plugin_feature_t){ FEATURE_REGISTER, FEATURE_##type, .arg.reg.f = _f } > | ^~~~~~~~ > ../../../../src/libstrongswan/plugins/plugin_feature.h:332:73: note: in expansion of macro '__PLUGIN_FEATURE_REGISTER' > 332 | #define _PLUGIN_FEATURE_REGISTER_RNG(type, f) __PLUGIN_FEATURE_REGISTER(type, f) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > ../../../../src/libstrongswan/plugins/plugin_feature.h:248:39: note: in expansion of macro '_PLUGIN_FEATURE_REGISTER_RNG' > 248 | #define PLUGIN_REGISTER(type, f, ...) _PLUGIN_FEATURE_REGISTER_##type(type, f, ##__VA_ARGS__) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > wolfssl_plugin.c:510:17: note: in expansion of macro 'PLUGIN_REGISTER' > 510 | PLUGIN_REGISTER(RNG, wolfssl_rng_create), > | ^~~~~~~~~~~~~~~ > ../../../../src/libstrongswan/plugins/plugin_feature.h:321:119: note: each undeclared identifier is reported only once for each function it appears in > 321 | #define __PLUGIN_FEATURE_REGISTER(type, _f) (plugin_feature_t){ FEATURE_REGISTER, FEATURE_##type, .arg.reg.f = _f } > | ^~~~~~~~ > ../../../../src/libstrongswan/plugins/plugin_feature.h:332:73: note: in expansion of macro '__PLUGIN_FEATURE_REGISTER' > 332 | #define _PLUGIN_FEATURE_REGISTER_RNG(type, f) __PLUGIN_FEATURE_REGISTER(type, f) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > ../../../../src/libstrongswan/plugins/plugin_feature.h:248:39: note: in expansion of macro '_PLUGIN_FEATURE_REGISTER_RNG' > 248 | #define PLUGIN_REGISTER(type, f, ...) _PLUGIN_FEATURE_REGISTER_##type(type, f, ##__VA_ARGS__) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > wolfssl_plugin.c:510:17: note: in expansion of macro 'PLUGIN_REGISTER' > 510 | PLUGIN_REGISTER(RNG, wolfssl_rng_create), > | ^~~~~~~~~~~~~~~ > make[6]: *** [Makefile:659: wolfssl_plugin.lo] Error 1 > > Reported Upstream: > https://github.com/strongswan/strongswan/issues/2410 > > This build failure started since 5.9.11 update in commit > 78959665b94b412d7a82ee43e3ede14278a5d924. > > Fixes: > - http://autobuild.buildroot.net/results/278/278b3f74c48c858ae368d59069752adb69c05246 > > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> > --- > package/strongswan/strongswan.mk | 5 +++++ > 1 file changed, 5 insertions(+) Applied to master, thanks. Thomas
>>>>> "Waldemar" == Waldemar Brodkorb <wbx@openadk.org> writes: > Disable RNG support so that following build failure does not happen: > In file included from ../../../../src/libstrongswan/plugins/plugin.h:28, > from wolfssl_plugin.h:34, > from wolfssl_plugin.c:29: > wolfssl_plugin.c: In function 'get_features': > ../../../../src/libstrongswan/plugins/plugin_feature.h:321:119: error: 'FEATURE_WC_RNG' undeclared (first use in this function); did you mean 'FEATURE_RNG'? > 321 | #define __PLUGIN_FEATURE_REGISTER(type, _f) (plugin_feature_t){ FEATURE_REGISTER, FEATURE_##type, .arg.reg.f = _f } > | ^~~~~~~~ > ../../../../src/libstrongswan/plugins/plugin_feature.h:332:73: note: > in expansion of macro '__PLUGIN_FEATURE_REGISTER' > 332 | #define _PLUGIN_FEATURE_REGISTER_RNG(type, f) > __PLUGIN_FEATURE_REGISTER(type, f) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > ../../../../src/libstrongswan/plugins/plugin_feature.h:248:39: note: > in expansion of macro '_PLUGIN_FEATURE_REGISTER_RNG' > 248 | #define PLUGIN_REGISTER(type, f, ...) > _PLUGIN_FEATURE_REGISTER_##type(type, f, ##__VA_ARGS__) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > wolfssl_plugin.c:510:17: note: in expansion of macro 'PLUGIN_REGISTER' > 510 | PLUGIN_REGISTER(RNG, wolfssl_rng_create), > | ^~~~~~~~~~~~~~~ > ../../../../src/libstrongswan/plugins/plugin_feature.h:321:119: note: > each undeclared identifier is reported only once for each function it > appears in > 321 | #define __PLUGIN_FEATURE_REGISTER(type, _f) > (plugin_feature_t){ FEATURE_REGISTER, FEATURE_##type, .arg.reg.f = _f > } > | ^~~~~~~~ > ../../../../src/libstrongswan/plugins/plugin_feature.h:332:73: note: > in expansion of macro '__PLUGIN_FEATURE_REGISTER' > 332 | #define _PLUGIN_FEATURE_REGISTER_RNG(type, f) > __PLUGIN_FEATURE_REGISTER(type, f) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > ../../../../src/libstrongswan/plugins/plugin_feature.h:248:39: note: > in expansion of macro '_PLUGIN_FEATURE_REGISTER_RNG' > 248 | #define PLUGIN_REGISTER(type, f, ...) > _PLUGIN_FEATURE_REGISTER_##type(type, f, ##__VA_ARGS__) > | ^~~~~~~~~~~~~~~~~~~~~~~~~ > wolfssl_plugin.c:510:17: note: in expansion of macro 'PLUGIN_REGISTER' > 510 | PLUGIN_REGISTER(RNG, wolfssl_rng_create), > | ^~~~~~~~~~~~~~~ > make[6]: *** [Makefile:659: wolfssl_plugin.lo] Error 1 > Reported Upstream: > https://github.com/strongswan/strongswan/issues/2410 > This build failure started since 5.9.11 update in commit > 78959665b94b412d7a82ee43e3ede14278a5d924. > Fixes: > - http://autobuild.buildroot.net/results/278/278b3f74c48c858ae368d59069752adb69c05246 > Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> Committed to 2024.02.x, thanks.
diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index a3fd9fe449..823b58555d 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -83,6 +83,11 @@ STRONGSWAN_DEPENDENCIES += \ $(if $(BR2_PACKAGE_MARIADB),mariadb) endif +# https://github.com/strongswan/strongswan/issues/2410 +ifeq ($(BR2_PACKAGE_STRONGSWAN_WOLFSSL),y) +STRONGSWAN_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DWC_NO_RNG" +endif + # disable connmark/forecast until net/if.h vs. linux/if.h conflict resolved # problem exist since linux 4.5 header changes STRONGSWAN_CONF_OPTS += \
Disable RNG support so that following build failure does not happen: In file included from ../../../../src/libstrongswan/plugins/plugin.h:28, from wolfssl_plugin.h:34, from wolfssl_plugin.c:29: wolfssl_plugin.c: In function 'get_features': ../../../../src/libstrongswan/plugins/plugin_feature.h:321:119: error: 'FEATURE_WC_RNG' undeclared (first use in this function); did you mean 'FEATURE_RNG'? 321 | #define __PLUGIN_FEATURE_REGISTER(type, _f) (plugin_feature_t){ FEATURE_REGISTER, FEATURE_##type, .arg.reg.f = _f } | ^~~~~~~~ ../../../../src/libstrongswan/plugins/plugin_feature.h:332:73: note: in expansion of macro '__PLUGIN_FEATURE_REGISTER' 332 | #define _PLUGIN_FEATURE_REGISTER_RNG(type, f) __PLUGIN_FEATURE_REGISTER(type, f) | ^~~~~~~~~~~~~~~~~~~~~~~~~ ../../../../src/libstrongswan/plugins/plugin_feature.h:248:39: note: in expansion of macro '_PLUGIN_FEATURE_REGISTER_RNG' 248 | #define PLUGIN_REGISTER(type, f, ...) _PLUGIN_FEATURE_REGISTER_##type(type, f, ##__VA_ARGS__) | ^~~~~~~~~~~~~~~~~~~~~~~~~ wolfssl_plugin.c:510:17: note: in expansion of macro 'PLUGIN_REGISTER' 510 | PLUGIN_REGISTER(RNG, wolfssl_rng_create), | ^~~~~~~~~~~~~~~ ../../../../src/libstrongswan/plugins/plugin_feature.h:321:119: note: each undeclared identifier is reported only once for each function it appears in 321 | #define __PLUGIN_FEATURE_REGISTER(type, _f) (plugin_feature_t){ FEATURE_REGISTER, FEATURE_##type, .arg.reg.f = _f } | ^~~~~~~~ ../../../../src/libstrongswan/plugins/plugin_feature.h:332:73: note: in expansion of macro '__PLUGIN_FEATURE_REGISTER' 332 | #define _PLUGIN_FEATURE_REGISTER_RNG(type, f) __PLUGIN_FEATURE_REGISTER(type, f) | ^~~~~~~~~~~~~~~~~~~~~~~~~ ../../../../src/libstrongswan/plugins/plugin_feature.h:248:39: note: in expansion of macro '_PLUGIN_FEATURE_REGISTER_RNG' 248 | #define PLUGIN_REGISTER(type, f, ...) _PLUGIN_FEATURE_REGISTER_##type(type, f, ##__VA_ARGS__) | ^~~~~~~~~~~~~~~~~~~~~~~~~ wolfssl_plugin.c:510:17: note: in expansion of macro 'PLUGIN_REGISTER' 510 | PLUGIN_REGISTER(RNG, wolfssl_rng_create), | ^~~~~~~~~~~~~~~ make[6]: *** [Makefile:659: wolfssl_plugin.lo] Error 1 Reported Upstream: https://github.com/strongswan/strongswan/issues/2410 This build failure started since 5.9.11 update in commit 78959665b94b412d7a82ee43e3ede14278a5d924. Fixes: - http://autobuild.buildroot.net/results/278/278b3f74c48c858ae368d59069752adb69c05246 Signed-off-by: Waldemar Brodkorb <wbx@openadk.org> --- package/strongswan/strongswan.mk | 5 +++++ 1 file changed, 5 insertions(+)