[gentoo-commits] repo/proj/guru:master commit in: net-misc/graftcp/

[gentoo-commits] repo/proj/guru:master commit in: net-misc/graftcp/

[Viorel Munteanu]

commit:     2780df72adabe5c5e6c3d66920ba060df54d9c2f
Author:     Yuhang Zeng <unlsycn <AT> unlsycn <DOT> com>
AuthorDate: Sun Feb 25 02:53:58 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 02:54:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2780df72

net-misc/graftcp: fix bug #925322 #925323

Signed-off-by: Yuhang Zeng <unlsycn <AT> unlsycn.com>

 net-misc/graftcp/graftcp-0.7.1.ebuild | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/net-misc/graftcp/graftcp-0.7.1.ebuild b/net-misc/graftcp/graftcp-0.7.1.ebuild
index 875749fa01..9e7159bce0 100644
--- a/net-misc/graftcp/graftcp-0.7.1.ebuild
+++ b/net-misc/graftcp/graftcp-0.7.1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="A tool for redirecting a given program's TCP traffic to SOCKS5 or HTTP proxy"
 HOMEPAGE="https://github.com/hmgle/graftcp"
 
-GO_OPTIONAL=1
+inherit toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -22,10 +22,11 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 
+IUSE="systemd"
 RDEPEND="${DEPEND}"
 BDEPEND="
 	dev-lang/go
-	dev-util/pkgconf
+	systemd? ( dev-util/pkgconf )
 "
 
 PATCHES="
@@ -41,7 +42,11 @@ src_prepare() {
 	mv "${WORKDIR}/vendor" "${WORKDIR}/${P}/local" || die
 }
 
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
 src_install() {
 	emake DESTDIR="${D}" PREFIX="/usr" install
-	emake DESTDIR="${D}" PREFIX="/usr" install_systemd
+	use systemd && emake DESTDIR="${D}" PREFIX="/usr" install_systemd
 }

[gentoo-commits] repo/proj/guru:master commit in: net-misc/graftcp/

[Viorel Munteanu]

commit:     e1696b7da5794dd6d220597f52299c136043befa
Author:     Yuhang Zeng <unlsycn <AT> unlsycn <DOT> com>
AuthorDate: Mon Feb 26 08:42:16 2024 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 08:44:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e1696b7d

net-misc/graftcp: keyword 0.7.1 for ~arm, ~arm64, ~x86

Signed-off-by: Yuhang Zeng <unlsycn <AT> unlsycn.com>

 net-misc/graftcp/graftcp-0.7.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-misc/graftcp/graftcp-0.7.1.ebuild b/net-misc/graftcp/graftcp-0.7.1.ebuild
index 9e7159bce0..6bee869a11 100644
--- a/net-misc/graftcp/graftcp-0.7.1.ebuild
+++ b/net-misc/graftcp/graftcp-0.7.1.ebuild
@@ -16,7 +16,7 @@ else
 	https://github.com/hmgle/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 	https://github.com/unlsycn/${PN}/releases/download/vendor-${PV}/${PN}-local-vendor-${PV}.tar.xz -> vendor.tar.xz
 	"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 "
 fi
 
 LICENSE="GPL-3"
@@ -43,7 +43,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {

[gentoo-commits] repo/proj/guru:master commit in: net-misc/graftcp/

[Julien Roy]

commit:     b159dcfeed000824de07699aa4dc895aa4c9de3c
Author:     Yuhang Zeng <unlsycn <AT> unlsycn <DOT> com>
AuthorDate: Wed Apr  3 01:25:08 2024 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Wed Apr  3 01:35:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b159dcfe

net-misc/graftcp: pass $(CC) when `make install`

The makefile call $(CC) to detect the machine architecture in a variable
thus it will be evaluated each time we enter the makefile, even when
executing `make install`

Signed-off-by: Yuhang Zeng <unlsycn <AT> unlsycn.com>

 net-misc/graftcp/graftcp-0.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-misc/graftcp/graftcp-0.7.1.ebuild b/net-misc/graftcp/graftcp-0.7.1.ebuild
index e9dc3322d0..fe0782d1cf 100644
--- a/net-misc/graftcp/graftcp-0.7.1.ebuild
+++ b/net-misc/graftcp/graftcp-0.7.1.ebuild
@@ -53,6 +53,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" DESTDIR="${D}" PREFIX="/usr" install
 	use systemd && emake DESTDIR="${D}" PREFIX="/usr" install_systemd
 }