* [Buildroot] [PATCH 1/1] package/ace: fix build with libressl >= 3.5.0
@ 2023-02-21 13:30 Fabrice Fontaine
2023-03-10 21:02 ` Arnout Vandecappelle
2023-03-17 8:29 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2023-02-21 13:30 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
Fix the following build failure with libressl raised since bump to
version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2:
/tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type
45 | static BIO_METHOD methods_ACE =
| ^~~~~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...Asynch_BIO.cpp-fix-build-with-libres.patch | 56 +++++++++++++++++++
1 file changed, 56 insertions(+)
create mode 100644 package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch
diff --git a/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch b/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch
new file mode 100644
index 0000000000..4f9fde5579
--- /dev/null
+++ b/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch
@@ -0,0 +1,56 @@
+From 82b139f921ddb549c1bd236030bbc86e314852b3 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Tue, 21 Feb 2023 14:20:11 +0100
+Subject: [PATCH] ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl >=
+ 3.5.0
+
+Fix the following build failure with libressl >= 3.5.0:
+
+/tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type
+ 45 | static BIO_METHOD methods_ACE =
+ | ^~~~~~~~~~~
+
+Fixes:
+ - http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[Upstream status: https://github.com/DOCGroup/ACE_TAO/pull/2053]
+---
+ ACE/ace/SSL/SSL_Asynch_BIO.cpp | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp
+index 0faa775fc0..5543598873 100644
+--- a/ace/SSL/SSL_Asynch_BIO.cpp
++++ b/ace/SSL/SSL_Asynch_BIO.cpp
+@@ -41,7 +41,8 @@ extern "C"
+
+ #define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK )
+
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)
+ static BIO_METHOD methods_ACE =
+ {
+ BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER,
+@@ -68,14 +69,15 @@ static BIO_METHOD methods_ACE =
+ #else
+ static BIO_METHOD* methods_ACE;
+ # define BIO_set_num(b, val)
+-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
++#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) */
+
+ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+
+ BIO *
+ ACE_SSL_make_BIO (void * ssl_asynch_stream)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)
+ BIO * const pBIO = BIO_new (&methods_ACE);
+ #else
+ if (!methods_ACE)
+--
+2.39.0
+
--
2.39.0
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/ace: fix build with libressl >= 3.5.0
2023-02-21 13:30 [Buildroot] [PATCH 1/1] package/ace: fix build with libressl >= 3.5.0 Fabrice Fontaine
@ 2023-03-10 21:02 ` Arnout Vandecappelle
2023-03-17 8:29 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Arnout Vandecappelle @ 2023-03-10 21:02 UTC (permalink / raw)
To: Fabrice Fontaine, buildroot
On 21/02/2023 14:30, Fabrice Fontaine wrote:
> Fix the following build failure with libressl raised since bump to
> version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2:
>
> /tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type
> 45 | static BIO_METHOD methods_ACE =
> | ^~~~~~~~~~~
>
> Fixes:
> - http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> ...Asynch_BIO.cpp-fix-build-with-libres.patch | 56 +++++++++++++++++++
> 1 file changed, 56 insertions(+)
> create mode 100644 package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch
>
> diff --git a/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch b/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch
> new file mode 100644
> index 0000000000..4f9fde5579
> --- /dev/null
> +++ b/package/ace/0002-ACE-ace-SSL-SSL_Asynch_BIO.cpp-fix-build-with-libres.patch
> @@ -0,0 +1,56 @@
> +From 82b139f921ddb549c1bd236030bbc86e314852b3 Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Tue, 21 Feb 2023 14:20:11 +0100
> +Subject: [PATCH] ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl >=
> + 3.5.0
> +
> +Fix the following build failure with libressl >= 3.5.0:
> +
> +/tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type
> + 45 | static BIO_METHOD methods_ACE =
> + | ^~~~~~~~~~~
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +[Upstream status: https://github.com/DOCGroup/ACE_TAO/pull/2053]
> +---
> + ACE/ace/SSL/SSL_Asynch_BIO.cpp | 8 +++++---
> + 1 file changed, 5 insertions(+), 3 deletions(-)
> +
> +diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp
> +index 0faa775fc0..5543598873 100644
> +--- a/ace/SSL/SSL_Asynch_BIO.cpp
> ++++ b/ace/SSL/SSL_Asynch_BIO.cpp
> +@@ -41,7 +41,8 @@ extern "C"
> +
> + #define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK )
> +
> +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
> ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
> ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)
> + static BIO_METHOD methods_ACE =
> + {
> + BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER,
> +@@ -68,14 +69,15 @@ static BIO_METHOD methods_ACE =
> + #else
> + static BIO_METHOD* methods_ACE;
> + # define BIO_set_num(b, val)
> +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
> ++#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) */
> +
> + ACE_BEGIN_VERSIONED_NAMESPACE_DECL
> +
> + BIO *
> + ACE_SSL_make_BIO (void * ssl_asynch_stream)
> + {
> +-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
> ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
> ++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)
> + BIO * const pBIO = BIO_new (&methods_ACE);
> + #else
> + if (!methods_ACE)
> +--
> +2.39.0
> +
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/1] package/ace: fix build with libressl >= 3.5.0
2023-02-21 13:30 [Buildroot] [PATCH 1/1] package/ace: fix build with libressl >= 3.5.0 Fabrice Fontaine
2023-03-10 21:02 ` Arnout Vandecappelle
@ 2023-03-17 8:29 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2023-03-17 8:29 UTC (permalink / raw)
To: Fabrice Fontaine; +Cc: buildroot
>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> Fix the following build failure with libressl raised since bump to
> version 3.5.2 in commit 8b216927db080b38fdbf1f8b025b6f90a89d4bc2:
> /tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type
> 45 | static BIO_METHOD methods_ACE =
> | ^~~~~~~~~~~
> Fixes:
> - http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2022.11.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-17 8:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-21 13:30 [Buildroot] [PATCH 1/1] package/ace: fix build with libressl >= 3.5.0 Fabrice Fontaine
2023-03-10 21:02 ` Arnout Vandecappelle
2023-03-17 8:29 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).