All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Cc: Romain Naour <romain.naour@gmail.com>, buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/1] package/stress-ng: fix uclibc-ng build
Date: Sun, 5 May 2024 19:41:42 +0200	[thread overview]
Message-ID: <ZjfE1lt9BoRK0854@landeda> (raw)
In-Reply-To: <20240504082014.238310-1-fontaine.fabrice@gmail.com>

Fabrice, All,

On 2024-05-04 10:20 +0200, Fabrice Fontaine spake thusly:
> Fix the following uclibc-ng build failure raised since bump to version
> 0.17.07 in commit 6fb179b906a1755d77bda9e501c5335ac163f3cb and
> https://github.com/ColinIanKing/stress-ng/commit/2ad8aff9bc1ab822cf615c72712c6031a8f60bbd:
> 
> stress-sock.c: In function 'stress_sock_client':
> stress-sock.c:656:35: error: 'SO_ZEROCOPY' undeclared (first use in this function); did you mean 'MSG_ZEROCOPY'?
>   656 |    if (setsockopt(fd, SOL_SOCKET, SO_ZEROCOPY, &so_zerocopy, sizeof(so_zerocopy)) == 0) {
>       |                                   ^~~~~~~~~~~
>       |                                   MSG_ZEROCOPY
> stress-sock.c:656:35: note: each undeclared identifier is reported only once for each function it appears in
> CC stress-sockfd.c
> stress-sock.c: In function 'stress_sock_server':
> stress-sock.c:1060:34: error: 'SO_ZEROCOPY' undeclared (first use in this function); did you mean 'MSG_ZEROCOPY'?
>  1060 |   if (setsockopt(fd, SOL_SOCKET, SO_ZEROCOPY, &so_zerocopy, sizeof(so_zerocopy)) == 0) {
>       |                                  ^~~~~~~~~~~
>       |                                  MSG_ZEROCOPY
> 
> Fixes: 6fb179b906a1755d77bda9e501c5335ac163f3cb
>  - http://autobuild.buildroot.org/results/bcff31bd9820cf0b95f8d8c6de44fd4ab8e2f065
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Applied to master, after changing the Upstream tag to the commit now
your PR has been merged, thanks!

Regards,
Yann E. MORIN.

> ---
>  ...sock.c-fix-build-without-SO_ZEROCOPY.patch | 56 +++++++++++++++++++
>  1 file changed, 56 insertions(+)
>  create mode 100644 package/stress-ng/0001-stress-sock.c-fix-build-without-SO_ZEROCOPY.patch
> 
> diff --git a/package/stress-ng/0001-stress-sock.c-fix-build-without-SO_ZEROCOPY.patch b/package/stress-ng/0001-stress-sock.c-fix-build-without-SO_ZEROCOPY.patch
> new file mode 100644
> index 0000000000..88fef900e7
> --- /dev/null
> +++ b/package/stress-ng/0001-stress-sock.c-fix-build-without-SO_ZEROCOPY.patch
> @@ -0,0 +1,56 @@
> +From 6a719f95e0547a6dfaa9178b42c2a5dbd931ce1a Mon Sep 17 00:00:00 2001
> +From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Date: Sat, 4 May 2024 10:04:20 +0200
> +Subject: [PATCH] stress-sock.c: fix build without SO_ZEROCOPY
> +
> +uclibc-ng defines MSG_ZEROCOPY but not SO_ZEROCOPY resulting in the
> +following build failure since version 0.17.04 and
> +https://github.com/ColinIanKing/stress-ng/commit/2ad8aff9bc1ab822cf615c72712c6031a8f60bbd:
> +
> +stress-sock.c: In function 'stress_sock_client':
> +stress-sock.c:656:35: error: 'SO_ZEROCOPY' undeclared (first use in this function); did you mean 'MSG_ZEROCOPY'?
> +  656 |    if (setsockopt(fd, SOL_SOCKET, SO_ZEROCOPY, &so_zerocopy, sizeof(so_zerocopy)) == 0) {
> +      |                                   ^~~~~~~~~~~
> +      |                                   MSG_ZEROCOPY
> +stress-sock.c:656:35: note: each undeclared identifier is reported only once for each function it appears in
> +CC stress-sockfd.c
> +stress-sock.c: In function 'stress_sock_server':
> +stress-sock.c:1060:34: error: 'SO_ZEROCOPY' undeclared (first use in this function); did you mean 'MSG_ZEROCOPY'?
> + 1060 |   if (setsockopt(fd, SOL_SOCKET, SO_ZEROCOPY, &so_zerocopy, sizeof(so_zerocopy)) == 0) {
> +      |                                  ^~~~~~~~~~~
> +      |                                  MSG_ZEROCOPY
> +
> +Fixes:
> + - http://autobuild.buildroot.org/results/bcff31bd9820cf0b95f8d8c6de44fd4ab8e2f065
> +
> +Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> +Upstream: https://github.com/ColinIanKing/stress-ng/pull/381
> +---
> + stress-sock.c | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/stress-sock.c b/stress-sock.c
> +index 253730168..880530d04 100644
> +--- a/stress-sock.c
> ++++ b/stress-sock.c
> +@@ -649,7 +649,7 @@ retry:
> + 				args->name, errno, strerror(errno));
> + 			goto free_controls;
> + 		}
> +-#if defined(MSG_ZEROCOPY)
> ++#if defined(MSG_ZEROCOPY) && defined(SO_ZEROCOPY)
> + 		if (sock_zerocopy) {
> + 			int so_zerocopy = 1;
> + 
> +@@ -1053,7 +1053,7 @@ static int OPTIMIZE3 stress_sock_server(
> + 		goto die;
> + 	}
> + 
> +-#if defined(MSG_ZEROCOPY)
> ++#if defined(MSG_ZEROCOPY) && defined(SO_ZEROCOPY)
> + 	if (sock_zerocopy) {
> + 		int so_zerocopy = 1;
> + 
> +-- 
> +2.43.0
> +
> -- 
> 2.43.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/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.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

  reply	other threads:[~2024-05-05 17:41 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-05-04  8:20 [Buildroot] [PATCH 1/1] package/stress-ng: fix uclibc-ng build Fabrice Fontaine
2024-05-05 17:41 ` Yann E. MORIN [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-05-08 20:11 Fabrice Fontaine
2024-05-09 14:32 ` 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=ZjfE1lt9BoRK0854@landeda \
    --to=yann.morin.1998@free.fr \
    --cc=buildroot@buildroot.org \
    --cc=fontaine.fabrice@gmail.com \
    --cc=romain.naour@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.