commit:     5f0751d20026400268c4126f49634d28798df203
Author:     Alfred Persson Forsberg <cat <AT> catcream <DOT> org>
AuthorDate: Fri Nov 17 05:48:28 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 12:06:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f0751d2

net-irc/soju: pass -D_LARGEFILE64_SOURCE for musl-1.2.4

[sam: The macro is not ideal at all but patching Go isn't exactly ideal
itself. Besides, this was arleady in the ebuild, but ignored b/c Go doesn't
yet in Gentoo respect CFLAGS et. al, although should soon.]

See-also: https://github.com/mattn/go-sqlite3/issues/1164
Closes: https://bugs.gentoo.org/912311
Signed-off-by: Alfred Persson Forsberg <cat <AT> catcream.org>
Closes: https://github.com/gentoo/gentoo/pull/33863
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-irc/soju/soju-0.6.2.ebuild | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/net-irc/soju/soju-0.6.2.ebuild b/net-irc/soju/soju-0.6.2.ebuild
index c46ca0fef568..2768e43d3193 100644
--- a/net-irc/soju/soju-0.6.2.ebuild
+++ b/net-irc/soju/soju-0.6.2.ebuild
@@ -26,19 +26,22 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 src_compile() {
-       # musl removed legacy LFS64 interfaces in version 1.2.4
-       # temporarily reenabled using _LARGEFILE64_SOURCE until
-       # this is resolved upstream
-       # https://github.com/mattn/go-sqlite3/issues/1164
-       append-cflags "-D_LARGEFILE64_SOURCE"
-
+       # musl removed legacy LFS64 interfaces in version 1.2.4 temporarily
+       # reenabled using _LARGEFILE64_SOURCE until this is resolved
+       # upstream https://github.com/mattn/go-sqlite3/issues/1164
+       CGO_CFLAGS="${CGO_CFLAGS}"
        if use sqlite; then
                GOFLAGS+=" -tags=libsqlite3"
+               CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
        elif use moderncsqlite; then
                GOFLAGS+=" -tags=moderncsqlite"
+               CGO_CFLAGS="-D_LARGEFILE64_SOURCE"
        else
                GOFLAGS+=" -tags=nosqlite"
        fi
+       # Only way to pass CFLAGS to CGO at the
+       # moment. https://github.com/gentoo/gentoo/pull/33539/
+       export CGO_CFLAGS
        use pam && GOFLAGS+=" -tags=pam"
 
        ego build ${GOFLAGS} ./cmd/soju

Reply via email to