All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bernd Kuhls <bernd@kuhls.net>
To: buildroot@buildroot.org
Cc: Jianhui Zhao <zhaojh329@gmail.com>
Subject: [Buildroot] [PATCH 1/1] package/libuhttpd: fix build with openssl3
Date: Thu, 20 Jul 2023 22:26:32 +0200	[thread overview]
Message-ID: <20230720202632.2567755-1-bernd@kuhls.net> (raw)

Fixes:
http://autobuild.buildroot.net/results/c09/c09c77e399e9ee410995a91a22306897eca667d1/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 ...eLists.txt-remove-Werror-from-CFLAGS.patch | 38 +++++++++++++++++++
 ...eLists.txt-remove-Werror-from-CFLAGS.patch | 38 +++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 package/libuhttpd/0002-CMakeLists.txt-remove-Werror-from-CFLAGS.patch
 create mode 100644 package/libuhttpd/0003-CMakeLists.txt-remove-Werror-from-CFLAGS.patch

diff --git a/package/libuhttpd/0002-CMakeLists.txt-remove-Werror-from-CFLAGS.patch b/package/libuhttpd/0002-CMakeLists.txt-remove-Werror-from-CFLAGS.patch
new file mode 100644
index 0000000000..01f66f42d9
--- /dev/null
+++ b/package/libuhttpd/0002-CMakeLists.txt-remove-Werror-from-CFLAGS.patch
@@ -0,0 +1,38 @@
+From a7d47180777366b9ee374ee1fe0f1a155a02160b Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd@kuhls.net>
+Date: Thu, 20 Jul 2023 22:14:16 +0200
+Subject: [PATCH] CMakeLists.txt: remove -Werror from CFLAGS
+
+Build is broken with OpenSSL 3.0, see buildroot autobuilder logs:
+http://autobuild.buildroot.net/results/c09/c09c77e399e9ee410995a91a22306897eca667d1/build-end.log
+
+/home/autobuild/autobuild/instance-2/output-1/build/libuhttpd-3.14.1/src/ssl/openssl.c:
+ In function 'ssl_last_error_string':
+/home/autobuild/autobuild/instance-2/output-1/build/libuhttpd-3.14.1/src/ssl/openssl.c:143:9:
+ error: 'ERR_peek_error_line_data' is deprecated: Since OpenSSL 3.0 [-Werror=deprecated-declarations]
+
+cc1: all warnings being treated as errors
+
+Upstream: https://github.com/zhaojh329/libuhttpd/pull/22
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6fb9651..64f506c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@ include(CheckLibraryExists)
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+ 
+ add_definitions(-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64)
+-add_compile_options(-O -Wall -Werror --std=gnu99)
++add_compile_options(-O -Wall --std=gnu99)
+ 
+ option(BUILD_STATIC "Build static library" OFF)
+ 
+-- 
+2.39.2
+
diff --git a/package/libuhttpd/0003-CMakeLists.txt-remove-Werror-from-CFLAGS.patch b/package/libuhttpd/0003-CMakeLists.txt-remove-Werror-from-CFLAGS.patch
new file mode 100644
index 0000000000..8e370e0a80
--- /dev/null
+++ b/package/libuhttpd/0003-CMakeLists.txt-remove-Werror-from-CFLAGS.patch
@@ -0,0 +1,38 @@
+From b22667f1054ea85c4dc3bdca5b7c84aeb0a801bc Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd@kuhls.net>
+Date: Thu, 20 Jul 2023 22:22:05 +0200
+Subject: [PATCH] CMakeLists.txt: remove -Werror from CFLAGS
+
+Build is broken with OpenSSL 3.0, see buildroot autobuilder logs:
+http://autobuild.buildroot.net/results/c09/c09c77e399e9ee410995a91a22306897eca667d1/build-end.log
+
+/home/autobuild/autobuild/instance-2/output-1/build/libuhttpd-3.14.1/src/ssl/openssl.c:
+ In function 'ssl_last_error_string':
+/home/autobuild/autobuild/instance-2/output-1/build/libuhttpd-3.14.1/src/ssl/openssl.c:143:9:
+ error: 'ERR_peek_error_line_data' is deprecated: Since OpenSSL 3.0 [-Werror=deprecated-declarations]
+
+cc1: all warnings being treated as errors
+
+Upstream: https://github.com/zhaojh329/ssl/pull/6
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 36488c7..98585b5 100644
+--- a/src/ssl/CMakeLists.txt
++++ b/src/ssl/CMakeLists.txt
+@@ -78,7 +78,7 @@ if(SSL_SUPPORT)
+ 
+     add_library(xssl STATIC ${SSL_SRC})
+     target_compile_definitions(xssl PRIVATE ${SSL_DEFINE})
+-    target_compile_options(xssl PRIVATE -O -Wall -Werror --std=gnu99 -fPIC)
++    target_compile_options(xssl PRIVATE -O -Wall --std=gnu99 -fPIC)
+     target_include_directories(xssl PRIVATE ${SSL_INC})
+     target_link_libraries(xssl PRIVATE ${SSL_LIBS})
+ 
+-- 
+2.39.2
+
-- 
2.39.2

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

             reply	other threads:[~2023-07-20 20:26 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-20 20:26 Bernd Kuhls [this message]
2023-07-20 21:18 ` [Buildroot] [PATCH 1/1] package/libuhttpd: fix build with openssl3 Thomas Petazzoni via buildroot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230720202632.2567755-1-bernd@kuhls.net \
    --to=bernd@kuhls.net \
    --cc=buildroot@buildroot.org \
    --cc=zhaojh329@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.