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 A8C67158041 for ; Mon, 1 Apr 2024 11:14:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A05D92BC020; Mon, 1 Apr 2024 11:14:42 +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 7F33A2BC01C for ; Mon, 1 Apr 2024 11:14:42 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD0203431C3 for ; Mon, 1 Apr 2024 11:14:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E87471627 for ; Mon, 1 Apr 2024 11:14:38 +0000 (UTC) From: "Julien Roy" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Julien Roy" Message-ID: <1711932801.0e71f03fe68682fccab80d6d2072b4896253daf0.julien@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: net-misc/graftcp/files/, net-misc/graftcp/ X-VCS-Repository: repo/proj/guru X-VCS-Files: net-misc/graftcp/files/0004-fix-parallel-build-dependency.patch net-misc/graftcp/files/0005-let-graftcp-respect-LDFLAGS.patch net-misc/graftcp/graftcp-0.7.1.ebuild X-VCS-Directories: net-misc/graftcp/ net-misc/graftcp/files/ X-VCS-Committer: julien X-VCS-Committer-Name: Julien Roy X-VCS-Revision: 0e71f03fe68682fccab80d6d2072b4896253daf0 X-VCS-Branch: master Date: Mon, 1 Apr 2024 11:14:38 +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: 4b42041f-f8fc-46d7-9707-65c1361e44d5 X-Archives-Hash: da645c10b2cda56b0978eaecdacf6125 commit: 0e71f03fe68682fccab80d6d2072b4896253daf0 Author: Yuhang Zeng unlsycn com> AuthorDate: Mon Apr 1 08:30:24 2024 +0000 Commit: Julien Roy jroy ca> CommitDate: Mon Apr 1 00:53:21 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0e71f03f net-misc/graftcp: fix QA notice Signed-off-by: Yuhang Zeng unlsycn.com> .../files/0004-fix-parallel-build-dependency.patch | 37 ++++++++++++++++++++++ .../files/0005-let-graftcp-respect-LDFLAGS.patch | 25 +++++++++++++++ net-misc/graftcp/graftcp-0.7.1.ebuild | 8 ++++- 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/net-misc/graftcp/files/0004-fix-parallel-build-dependency.patch b/net-misc/graftcp/files/0004-fix-parallel-build-dependency.patch new file mode 100644 index 0000000000..c2905009d2 --- /dev/null +++ b/net-misc/graftcp/files/0004-fix-parallel-build-dependency.patch @@ -0,0 +1,37 @@ +From 2c1a891d5e11f0faf49e6a33a566342590ab62df Mon Sep 17 00:00:00 2001 +From: "mingang.he" +Date: Thu, 22 Feb 2024 12:09:00 +0000 +Subject: [PATCH] Fix parallel build dependency, close #65 + +This commit corrects the dependency issue in the Makefile which was causing errors during parallel builds. Specifically, it addresses the following changes: + +- Separate build rules for local/graftcp-local and local/mgraftcp to individually specify their dependencies and build commands. +- Ensure local/mgraftcp explicitly depends on libgraftcp.a, and build it prior to local/mgraftcp to resolve potential race conditions. +- The local/graftcp-local target does not depend on libgraftcp.a, hence a separate rule is created without this dependency. + +These adjustments ensure that each binary is built correctly respecting their precise dependencies, and thus preventing errors that may occur due to incorrect builds when using the -j option for parallel execution in make. +--- + Makefile | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 64d088a..22c46ab 100644 +--- a/Makefile ++++ b/Makefile +@@ -67,8 +67,11 @@ libgraftcp.a: graftcp.o util.o cidr-trie.o conf.o + %.o: %.c + $(CC) $(CFLAGS) -c -o $@ $< + +-$(GRAFTCP_LOCAL_BIN):: +- $(MAKE) -C local VERSION=$(VERSION) CC=$(CC) CXX=$(CXX) AR=$(AR) ++local/graftcp-local: ++ $(MAKE) -C $(dir $@) VERSION=$(VERSION) CC=$(CC) CXX=$(CXX) AR=$(AR) $(notdir $@) ++ ++local/mgraftcp: libgraftcp.a ++ $(MAKE) -C $(dir $@) VERSION=$(VERSION) CC=$(CC) CXX=$(CXX) AR=$(AR) $(notdir $@) + + install:: graftcp $(GRAFTCP_LOCAL_BIN) + $(INSTALL) $< $(DESTDIR)$(BINDIR)/$< +-- +2.44.0 + diff --git a/net-misc/graftcp/files/0005-let-graftcp-respect-LDFLAGS.patch b/net-misc/graftcp/files/0005-let-graftcp-respect-LDFLAGS.patch new file mode 100644 index 0000000000..fd3969f29b --- /dev/null +++ b/net-misc/graftcp/files/0005-let-graftcp-respect-LDFLAGS.patch @@ -0,0 +1,25 @@ +From 17e60d1a6e9a1a8ee4e2c6016388a6ee5f1b2284 Mon Sep 17 00:00:00 2001 +From: unlsycn +Date: Mon, 1 Apr 2024 16:22:53 +0800 +Subject: [PATCH] let graftcp respect LDFLAGS + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 22c46ab..a9a6776 100644 +--- a/Makefile ++++ b/Makefile +@@ -59,7 +59,7 @@ all:: $(TARGET) + + + graftcp: main.o graftcp.o util.o cidr-trie.o conf.o +- $(CC) $^ -o $@ ++ $(CC) $^ -o $@ $(LDFLAGS) + + libgraftcp.a: graftcp.o util.o cidr-trie.o conf.o + $(AR) rcs $@ $^ +-- +2.44.0 + diff --git a/net-misc/graftcp/graftcp-0.7.1.ebuild b/net-misc/graftcp/graftcp-0.7.1.ebuild index 6bee869a11..e9dc3322d0 100644 --- a/net-misc/graftcp/graftcp-0.7.1.ebuild +++ b/net-misc/graftcp/graftcp-0.7.1.ebuild @@ -33,9 +33,15 @@ PATCHES=" ${FILESDIR}/0001-build-not-enabling-service-in-install_systemd.patch ${FILESDIR}/0002-build-no-longer-strip-symbols.patch ${FILESDIR}/0003-version-v0.7.patch + ${FILESDIR}/0004-fix-parallel-build-dependency.patch + ${FILESDIR}/0005-let-graftcp-respect-LDFLAGS.patch " -MAKEOPTS="${MAKEOPTS} -j1" +# Generated by nim +QA_FLAGS_IGNORED=" + /usr/bin/graftcp-local + /usr/bin/mgraftcp + " src_prepare() { default