From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BF19C15823F for ; Fri, 17 Nov 2023 12:07:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2B0C2BC024; Fri, 17 Nov 2023 12:07:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEA972BC024 for ; Fri, 17 Nov 2023 12:07:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 01067335D1C for ; Fri, 17 Nov 2023 12:07:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4605D139C for ; Fri, 17 Nov 2023 12:07:41 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1700222773.5f0751d20026400268c4126f49634d28798df203.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/soju/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-irc/soju/soju-0.6.2.ebuild X-VCS-Directories: net-irc/soju/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5f0751d20026400268c4126f49634d28798df203 X-VCS-Branch: master Date: Fri, 17 Nov 2023 12:07:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f25f632a-ba7c-4b93-8db9-bd588a388507 X-Archives-Hash: f3af63ecab70c71eea2b47880695d1b4 commit: 5f0751d20026400268c4126f49634d28798df203 Author: Alfred Persson Forsberg catcream org> AuthorDate: Fri Nov 17 05:48:28 2023 +0000 Commit: Sam James gentoo 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 catcream.org> Closes: https://github.com/gentoo/gentoo/pull/33863 Signed-off-by: Sam James 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