public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/files/, net-ftp/lftp/
Date: Mon, 02 Jun 2025 21:41:47 +0000 (UTC)	[thread overview]
Message-ID: <1748900362.b440004b41724c625e6e1c2cc889245d4ebd7966.sam@gentoo> (raw)

commit:     b440004b41724c625e6e1c2cc889245d4ebd7966
Author:     Z. Liu <zhixu.liu <AT> gmail <DOT> com>
AuthorDate: Mon Jun  2 08:08:35 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun  2 21:39:22 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b440004b

net-ftp/lftp: fix musl build if using clang

otherwise build failed with:
> error: 'rpl_strtol' is not a member of 'std'

Signed-off-by: Z. Liu <zhixu.liu <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/42398
Closes: https://github.com/gentoo/gentoo/pull/42398
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/lftp/files/lftp-4.9.3-gnulib-stdlib.h.patch | 13 +++++++++++++
 net-ftp/lftp/lftp-4.9.3.ebuild                      |  1 +
 2 files changed, 14 insertions(+)

diff --git a/net-ftp/lftp/files/lftp-4.9.3-gnulib-stdlib.h.patch b/net-ftp/lftp/files/lftp-4.9.3-gnulib-stdlib.h.patch
new file mode 100644
index 000000000000..498ee402bee5
--- /dev/null
+++ b/net-ftp/lftp/files/lftp-4.9.3-gnulib-stdlib.h.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/stdlib.in.h b/lib/stdlib.in.h
+index ed00a43..f37ff84 100644
+--- a/lib/stdlib.in.h
++++ b/lib/stdlib.in.h
+@@ -119,7 +119,7 @@ struct random_data
+ # include <unistd.h>
+ #endif
+ 
+-#if ((@GNULIB_STRTOL@ && @REPLACE_STRTOL@) || (@GNULIB_STRTOLL@ && @REPLACE_STRTOLL@) || (@GNULIB_STRTOUL@ && @REPLACE_STRTOUL@) || (@GNULIB_STRTOULL@ && @REPLACE_STRTOULL@)) && defined __cplusplus && !defined GNULIB_NAMESPACE && defined __GNUG__ && !defined __clang__
++#if ((@GNULIB_STRTOL@ && @REPLACE_STRTOL@) || (@GNULIB_STRTOLL@ && @REPLACE_STRTOLL@) || (@GNULIB_STRTOUL@ && @REPLACE_STRTOUL@) || (@GNULIB_STRTOULL@ && @REPLACE_STRTOULL@)) && defined __cplusplus && !defined GNULIB_NAMESPACE && defined __GNUG__
+ /* When strtol, strtoll, strtoul, or strtoull is going to be defined as a macro
+    below, this may cause compilation errors later in the libstdc++ header files
+    (that are part of GCC), such as:

diff --git a/net-ftp/lftp/lftp-4.9.3.ebuild b/net-ftp/lftp/lftp-4.9.3.ebuild
index a752e9b04674..6f3384a12771 100644
--- a/net-ftp/lftp/lftp-4.9.3.ebuild
+++ b/net-ftp/lftp/lftp-4.9.3.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.9.1-libdir-readline.patch
 	"${FILESDIR}"/${PN}-4.9.2-socks.patch
 	"${FILESDIR}"/${PN}-4.9.3-gnulib.patch
+	"${FILESDIR}"/${PN}-4.9.3-gnulib-stdlib.h.patch
 )
 
 # Gnulib false positive #900064


             reply	other threads:[~2025-06-02 21:42 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-02 21:41 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-04 23:25 [gentoo-commits] repo/gentoo:master commit in: net-ftp/lftp/files/, net-ftp/lftp/ Conrad Kostecki
2020-11-15 18:57 Sergei Trofimovich
2020-11-07  8:49 Sergei Trofimovich
2020-01-15 23:37 Jeroen Roovers
2018-02-05 15:01 Jeroen Roovers
2017-02-13  8:05 Jeroen Roovers

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=1748900362.b440004b41724c625e6e1c2cc889245d4ebd7966.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox