From nobody Tue Dec 31 14:00:45 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YMvkm1l9Bz5jV2d; Tue, 31 Dec 2024 14:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YMvkj6CWGz4nY1; Tue, 31 Dec 2024 14:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735653645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vRiB1nKNbqTjigjieM9Nmt12cPN7Xnkt4xJrrdUJD64=; b=Q8lNsgFReKeD/d+MXiV3UfnVigJ1LGaaVCi4x+ZHXx1eMja0KBYICo31mQrJsnHTIDwzGt Mz64SlQOBjabtjZuwCp0306sBpib+s29RMCRjIMS8MMgB1zDPP7Owgtl9nnYtmDnEo2pW+ usGbsEoET18KVU0oIj6J+1hNyrVfDk7VulUkWjDv6F87de/0x0F6bn9TcGMhp1wMg4E4O9 zUuoScgc6JNdM/3Hy14nVLQoi1y7otNJ1PrSuQktHbYrkqaF85QRJexEsWV/2Puazz5Oa+ 1GEKBVhSLSU15H5HkTXRNrHYqZXHV0jyz9WpBbTcamC6rnGoryKZt5YfmpLtGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735653645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vRiB1nKNbqTjigjieM9Nmt12cPN7Xnkt4xJrrdUJD64=; b=ACHSKVPp+UzvyJ++hI8xc6xjT9SHrzP0JqMSU3fv3VHHpHLOYCbATIf4mMaht0fMSGhL3w jlZqFAhmX8ERFB13DGKgs4Ltl4EAGFJdhBFJz5jU5ij0lWo5oDWL2TwCMAl4Rq1xEpTqrE oLq5HfbfiuPnFmExjOBY+oLPo2JY84HFqert7/esgssYp5l1aPFQzX0UYermmFcZ8k1fFg j23iKPPejIIyqJjuW3yG0Epu4XWF8u1m6fa2hMdikwZg8BmlIgdBIBqYb6yKbSD9PgBrT9 6z7ITYujpZocYtOUOK4cLCEiQ6d9L3622M5A3aClwxTturKX50P67PWkunDwPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735653645; a=rsa-sha256; cv=none; b=lrjXkSLHt17Nlys7ckdz9TCKfXyk/rnlJInAjb/KWMKKplsFPP6F42mgggW3MDR/GFrFpN SKQj/EaDTkn0RdopUkPAF5ql8cIoKwk5aioKneQiP2S2OY5LMpGAQ0DDD65h0Y+kzaCXDm XmgsmEaczSltcfe+1mXROTKJ51XN59pgqvkQNo2Sbfq7AlfJm6J/KEWDQ7GQMwsXL40jgJ /7pNlo4Z96yVzBwGBkjEmoibVLq1TaoNFJcSceSqMiEdl+yEs20RnEr6yPM/g5yX0HxAkl v2o1Wc2JthZwgaHZhkd9GyhZ6/2uxCAux3nay/Kdd3eQ/LMimwTQ3XEuq4bTTg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YMvkj5DMszjFY; Tue, 31 Dec 2024 14:00:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BVE0jUq053408; Tue, 31 Dec 2024 14:00:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BVE0jK9053405; Tue, 31 Dec 2024 14:00:45 GMT (envelope-from git) Date: Tue, 31 Dec 2024 14:00:45 GMT Message-Id: <202412311400.4BVE0jK9053405@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: fa9d4a55d08c - main - devel/9base: fix build on powerpc64 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa9d4a55d08c3f4d4780f21e01f06ae2288967d2 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa9d4a55d08c3f4d4780f21e01f06ae2288967d2 commit fa9d4a55d08c3f4d4780f21e01f06ae2288967d2 Author: Piotr Kubaj AuthorDate: 2024-12-27 22:28:03 +0000 Commit: Piotr Kubaj CommitDate: 2024-12-31 13:59:53 +0000 devel/9base: fix build on powerpc64 Fix kcmp() collision with unistd.h: sort.c:111:5: error: conflicting types for 'kcmp' 111 | int kcmp(Key*, Key*); | ^ /usr/include/unistd.h:525:6: note: previous declaration is here 525 | int kcmp(pid_t pid1, pid_t pid2, int type, uintptr_t idx1, uintptr_t idx2); | ^ sort.c:205:28: error: too few arguments to function call, expected 5, have 2 205 | n = kcmp(ol->key, l->key); | ~~~~ ^ --- devel/9base/files/patch-sort_sort.c | 56 +++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/devel/9base/files/patch-sort_sort.c b/devel/9base/files/patch-sort_sort.c new file mode 100644 index 000000000000..b4371784981c --- /dev/null +++ b/devel/9base/files/patch-sort_sort.c @@ -0,0 +1,56 @@ +--- sort/sort.c.orig 2024-12-27 22:10:51 UTC ++++ sort/sort.c +@@ -108,7 +108,7 @@ void done(char*); + void dokey_m(Key*, uchar*, uchar*, Field*); + void dokey_r(Key*, uchar*, uchar*, Field*); + void done(char*); +-int kcmp(Key*, Key*); ++int kcmp2(Key*, Key*); + void makemapd(Field*); + void makemapm(Field*); + void mergefiles(int, int, Biobuf*); +@@ -202,7 +202,7 @@ dofile(Biobuf *b) + l = newline(b); + if(l == 0) + break; +- n = kcmp(ol->key, l->key); ++ n = kcmp2(ol->key, l->key); + if(n > 0 || (n == 0 && args.uflag)) { + fprint(2, "sort: -c file not in sort\n"); /**/ + done("order"); +@@ -448,7 +448,7 @@ mergefiles(int t, int n, Biobuf *b) + break; + for(;;) { + l = m->line; +- if(args.uflag && ok && kcmp(ok, l->key) == 0) { ++ if(args.uflag && ok && kcmp2(ok, l->key) == 0) { + free(l->key); + free(l); + } else { +@@ -467,7 +467,7 @@ mergefiles(int t, int n, Biobuf *b) + } + m->line = l; + m->key = l->key; +- if(nn > 1 && kcmp(mmp[0]->key, mmp[1]->key) > 0) ++ if(nn > 1 && kcmp2(mmp[0]->key, mmp[1]->key) > 0) + break; + } + } +@@ -485,7 +485,7 @@ int + } + + int +-kcmp(Key *ka, Key *kb) ++kcmp2(Key *ka, Key *kb) + { + int n, m; + +@@ -511,7 +511,7 @@ printout(Biobuf *b) + ok = 0; + for(n=args.nline; n>0; n--) { + l = *lp++; +- if(args.uflag && ok && kcmp(ok, l->key) == 0) ++ if(args.uflag && ok && kcmp2(ok, l->key) == 0) + continue; + lineout(b, l); + ok = l->key;