* [Buildroot] [PATCH 1/1] package/pkcs11-helper: fix build without threads
@ 2020-05-01 10:27 Fabrice Fontaine
2020-05-01 12:11 ` Yann E. MORIN
0 siblings, 1 reply; 5+ messages in thread
From: Fabrice Fontaine @ 2020-05-01 10:27 UTC (permalink / raw)
To: buildroot
Use --{en,dis}able-{threading,slotevent} to fix build without threads
Fixes:
- http://autobuild.buildroot.org/results/d6eefca3ab1fb86e148e998238eed1df2310775f
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/pkcs11-helper/pkcs11-helper.mk | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/package/pkcs11-helper/pkcs11-helper.mk b/package/pkcs11-helper/pkcs11-helper.mk
index a95340daf7..4d0974dd0f 100644
--- a/package/pkcs11-helper/pkcs11-helper.mk
+++ b/package/pkcs11-helper/pkcs11-helper.mk
@@ -48,4 +48,14 @@ PKCS11_HELPER_CONF_OPTS += \
--disable-crypto-engine-openssl
endif
+ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
+PKCS11_HELPER_CONF_OPTS += \
+ --enable-slotevent \
+ --enable-threading
+else
+PKCS11_HELPER_CONF_OPTS += \
+ --disable-slotevent \
+ --disable-threading
+endif
+
$(eval $(autotools-package))
--
2.26.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/pkcs11-helper: fix build without threads
2020-05-01 10:27 [Buildroot] [PATCH 1/1] package/pkcs11-helper: fix build without threads Fabrice Fontaine
@ 2020-05-01 12:11 ` Yann E. MORIN
0 siblings, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2020-05-01 12:11 UTC (permalink / raw)
To: buildroot
Fabrice, All,
On 2020-05-01 12:27 +0200, Fabrice Fontaine spake thusly:
> Use --{en,dis}able-{threading,slotevent} to fix build without threads
>
> Fixes:
> - http://autobuild.buildroot.org/results/d6eefca3ab1fb86e148e998238eed1df2310775f
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, with two little changes: move earlier; use
single-line assignments. Thanks!
Regards,
Yann E. MORIN.
> ---
> package/pkcs11-helper/pkcs11-helper.mk | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/package/pkcs11-helper/pkcs11-helper.mk b/package/pkcs11-helper/pkcs11-helper.mk
> index a95340daf7..4d0974dd0f 100644
> --- a/package/pkcs11-helper/pkcs11-helper.mk
> +++ b/package/pkcs11-helper/pkcs11-helper.mk
> @@ -48,4 +48,14 @@ PKCS11_HELPER_CONF_OPTS += \
> --disable-crypto-engine-openssl
> endif
>
> +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
> +PKCS11_HELPER_CONF_OPTS += \
> + --enable-slotevent \
> + --enable-threading
> +else
> +PKCS11_HELPER_CONF_OPTS += \
> + --disable-slotevent \
> + --disable-threading
> +endif
> +
> $(eval $(autotools-package))
> --
> 2.26.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/pkcs11-helper: fix build without threads
2022-03-20 15:47 Fabrice Fontaine
2022-03-27 15:57 ` Arnout Vandecappelle
@ 2022-03-30 20:02 ` Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2022-03-30 20:02 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Fix the following build failure without threads and openvpn raised since
> commit 0199dc161769e5f28e9aebc634230ece08ff5008:
> /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld:
> /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so:
> undefined reference to `_pkcs11h_slotevent_init'
> Fixes:
> - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/pkcs11-helper: fix build without threads
2022-03-20 15:47 Fabrice Fontaine
@ 2022-03-27 15:57 ` Arnout Vandecappelle
2022-03-30 20:02 ` Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2022-03-27 15:57 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot
On 20/03/2022 16:47, Fabrice Fontaine wrote:
> Fix the following build failure without threads and openvpn raised since
> commit 0199dc161769e5f28e9aebc634230ece08ff5008:
>
> /home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init'
>
> Fixes:
> - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> ...h-core.c-fix-build-without-slotevent.patch | 37 +++++++++++++++++++
> 1 file changed, 37 insertions(+)
> create mode 100644 package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch
>
> diff --git a/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch
> new file mode 100644
> index 0000000000..5b2829c5ca
> --- /dev/null
> +++ b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch
> @@ -0,0 +1,37 @@
> +From 754911f553414a77d5b52001f5ef6e3a1314c4d5 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Sun, 20 Mar 2022 08:50:15 +0100
> +Subject: [PATCH] lib/pkcs11h-core.c: fix build without slotevent
> +
> +Fix the following build failure with --disable-slotevent:
> +
> +/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init'
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Upstream status: https://github.com/OpenSC/pkcs11-helper/pull/50]
> +---
> + lib/pkcs11h-core.c | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/lib/pkcs11h-core.c b/lib/pkcs11h-core.c
> +index d7bb4cd..0bf11e8 100644
> +--- a/lib/pkcs11h-core.c
> ++++ b/lib/pkcs11h-core.c
> +@@ -726,9 +726,11 @@ pkcs11h_setProperty (
> +
> + switch (property) {
> + case PKCS11H_PROPERTY_SLOT_EVENT_HOOK:
> ++#if defined(ENABLE_PKCS11H_SLOTEVENT)
> + if ((rv = _pkcs11h_slotevent_init ()) != CKR_OK) {
> + goto cleanup;
> + }
> ++#endif
> + break;
> + }
> + cleanup:
> +--
> +2.35.1
> +
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] package/pkcs11-helper: fix build without threads
@ 2022-03-20 15:47 Fabrice Fontaine
2022-03-27 15:57 ` Arnout Vandecappelle
2022-03-30 20:02 ` Peter Korsgaard
0 siblings, 2 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2022-03-20 15:47 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
Fix the following build failure without threads and openvpn raised since
commit 0199dc161769e5f28e9aebc634230ece08ff5008:
/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init'
Fixes:
- http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...h-core.c-fix-build-without-slotevent.patch | 37 +++++++++++++++++++
1 file changed, 37 insertions(+)
create mode 100644 package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch
diff --git a/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch
new file mode 100644
index 0000000000..5b2829c5ca
--- /dev/null
+++ b/package/pkcs11-helper/0001-lib-pkcs11h-core.c-fix-build-without-slotevent.patch
@@ -0,0 +1,37 @@
+From 754911f553414a77d5b52001f5ef6e3a1314c4d5 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 20 Mar 2022 08:50:15 +0100
+Subject: [PATCH] lib/pkcs11h-core.c: fix build without slotevent
+
+Fix the following build failure with --disable-slotevent:
+
+/home/giuliobenetti/autobuild/run/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabihf/9.3.0/../../../../arm-buildroot-linux-uclibcgnueabihf/bin/ld: /home/giuliobenetti/autobuild/run/instance-0/output-1/host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/lib/libpkcs11-helper.so: undefined reference to `_pkcs11h_slotevent_init'
+
+Fixes:
+ - http://autobuild.buildroot.org/results/fcaa70cc035d6f9d35dfa8d564e9948c7e1cfd9e
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/OpenSC/pkcs11-helper/pull/50]
+---
+ lib/pkcs11h-core.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/pkcs11h-core.c b/lib/pkcs11h-core.c
+index d7bb4cd..0bf11e8 100644
+--- a/lib/pkcs11h-core.c
++++ b/lib/pkcs11h-core.c
+@@ -726,9 +726,11 @@ pkcs11h_setProperty (
+
+ switch (property) {
+ case PKCS11H_PROPERTY_SLOT_EVENT_HOOK:
++#if defined(ENABLE_PKCS11H_SLOTEVENT)
+ if ((rv = _pkcs11h_slotevent_init ()) != CKR_OK) {
+ goto cleanup;
+ }
++#endif
+ break;
+ }
+ cleanup:
+--
+2.35.1
+
--
2.35.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-03-30 20:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-01 10:27 [Buildroot] [PATCH 1/1] package/pkcs11-helper: fix build without threads Fabrice Fontaine
2020-05-01 12:11 ` Yann E. MORIN
2022-03-20 15:47 Fabrice Fontaine
2022-03-27 15:57 ` Arnout Vandecappelle
2022-03-30 20:02 ` Peter Korsgaard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.