From nobody Sun Jan 28 02:32:14 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 4TMwSG4s0rz57Tfm; Sun, 28 Jan 2024 02:32:14 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TMwSG41z7z4kcR; Sun, 28 Jan 2024 02:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706409134; 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=rfXktPMEtW/KtuSKoVdHpHLLGRkGTaJwOUfxVf6S870=; b=LD7vjCbwxoGeXMqypgDY8ny9g91/BrFjyjMUhn0rcm9XFpBLeFYKkCIjWN5TQ6tWNXfzo8 h+XufMFIw7cSoa2WpNAtMJC84wQZ8ncsxqor4d47cjTq6+PQO6C6W6E9X3vlzmO3N/Uk1z Ndnz3zja6OM9/jg1QsE3/hhjPISQtaVDk9EXqA6ObOPIu0zZCfPFYsLoCT9aAmibPz6w9h gEZQV/V+PYfpQ2YWC8/5XrOmjrgC9tUDJrcFCRFbvY0w+AQtWYdeUKuj0UfUeU0vI60mb4 cQJdtFuxOefXrwQVaA8MHu+K6hNsWgfShGVA1NkQ0pRJl6haM0mgvStD0MdZUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706409134; 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=rfXktPMEtW/KtuSKoVdHpHLLGRkGTaJwOUfxVf6S870=; b=Evcu/UScKMYi5a8ZB8NwN3+V61n6lyBKJvjZx39G3g2mCXordxc3yCCppnvwnXyVApDR3z rrGDNxIyo5Y0WLTrUmDrVmindQu7uKf5cQsl6rifmKdbqTVael8dbWo7A6GBWZBpHYO3PX TeB1lTmUrBp8AFLhE/Z5bmbiJ6ZCQpC0e8WbLrn1mchS7Xtxd4VCA3UOGI8JfUQzT0VoJj FWWvucXMOmlB269qykQ/CKNxw3aEzu+O9TioNGPKrYWqm/Sq/Q/8DWqo7Igb/Wr6z6Jct8 EGgVYf8pThFOy9v72ajZfA8W+X0eYAPnMGh88QCJrWvXD4yJKxN+eQAwLUKrwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706409134; a=rsa-sha256; cv=none; b=plS6VXDd4wQAqQWjjamhy09W5hs07D8GvocchdoIWNrpRg81yZBpzeYor7JsKR9vfVoJ/B OnGr/sl3VFB79bkXYAHiSHSOsBoV6WH+TObrxz9lZyl6foXVXTrVAI7+M2t79SIL0j4s0z sC3oQb9rRg8eudk/B+uRj/soIuo64Bp9A/yD51tal/fqHuFZDpB5vUA+RhzwhzOew1YItv 765u/61VZzgAHAPeGdGNXsl3Y1oh2tJ/AatVa5bIrVFt4YcsML/Uw7b83lZ7O3URxq89xs 0AOTconSFyFy85/JOdUIB/+cE+yM1id0rB5fi8x59pJTCjcx+ntq3M/nU0PvwQ== 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 4TMwSG36jCzqZ1; Sun, 28 Jan 2024 02:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40S2WEWn062514; Sun, 28 Jan 2024 02:32:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40S2WEVU062511; Sun, 28 Jan 2024 02:32:14 GMT (envelope-from git) Date: Sun, 28 Jan 2024 02:32:14 GMT Message-Id: <202401280232.40S2WEVU062511@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: 51624c490261 - main - net/drawterm: fix build on powerpc* 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: 51624c4902617da5d2dee11b390ada2fd61e25b3 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=51624c4902617da5d2dee11b390ada2fd61e25b3 commit 51624c4902617da5d2dee11b390ada2fd61e25b3 Author: Piotr Kubaj AuthorDate: 2024-01-26 17:56:18 +0000 Commit: Piotr Kubaj CommitDate: 2024-01-28 02:32:04 +0000 net/drawterm: fix build on powerpc* arch=`uname -m|sed 's/i.86/386/;s/Power Macintosh/power/; s/x86_64/amd64/'`; (cd posix-$arch && make) cd: posix-powerpc: No such file or directory *** Error code 2 --- net/drawterm/files/patch-Make.freebsd | 27 +++++++-------------------- net/drawterm/files/patch-posix-power_Makefile | 11 +++++++++++ net/drawterm/files/patch-posix-power_tas.c | 27 +++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 20 deletions(-) diff --git a/net/drawterm/files/patch-Make.freebsd b/net/drawterm/files/patch-Make.freebsd index 127a6bbf63bb..245dc6ff6ae1 100644 --- a/net/drawterm/files/patch-Make.freebsd +++ b/net/drawterm/files/patch-Make.freebsd @@ -1,22 +1,9 @@ ---- Make.freebsd.orig 2023-11-18 06:48:07 UTC +--- Make.freebsd.orig 2023-09-03 17:22:52 UTC +++ Make.freebsd -@@ -1,16 +1,12 @@ - # OpenBSD - PTHREAD=-pthread --AR=ar --AS=as - RANLIB=ranlib --X11=/usr/local --CC=clang --CFLAGS=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) -O2 -+CFLAGS+=-Wall -Wno-missing-braces -ggdb -I$(ROOT) -I$(ROOT)/include -I$(ROOT)/kern -c -I$(X11)/include -D_THREAD_SAFE $(PTHREAD) -O2 - O=o - OS=posix - GUI=x11 --LDADD=-L$(X11)/lib64 -L$(X11)/lib -lX11 -ggdb --LDFLAGS=$(PTHREAD) -+LDADD=-lX11 -ggdb -+LDFLAGS+=$(PTHREAD) - TARG=drawterm - AUDIO=unix +@@ -17,5 +17,5 @@ libmachdep.a: + all: default + libmachdep.a: +- arch=`uname -m|sed 's/i.86/386/;s/Power Macintosh/power/; s/x86_64/amd64/'`; \ ++ arch=`uname -m|sed 's/i.86/386/;s/powerpc.*/power/; s/x86_64/amd64/'`; \ + (cd posix-$$arch && make) diff --git a/net/drawterm/files/patch-posix-power_Makefile b/net/drawterm/files/patch-posix-power_Makefile new file mode 100644 index 000000000000..b38d8ad01923 --- /dev/null +++ b/net/drawterm/files/patch-posix-power_Makefile @@ -0,0 +1,11 @@ +--- posix-power/Makefile.orig 2023-09-03 17:22:52 UTC ++++ posix-power/Makefile +@@ -2,8 +2,6 @@ LIB=../libmachdep.a + include ../Make.config + LIB=../libmachdep.a + +-CFLAGS+= -Wa,-mregnames +- + OFILES=\ + getcallerpc.$O\ + tas.$O diff --git a/net/drawterm/files/patch-posix-power_tas.c b/net/drawterm/files/patch-posix-power_tas.c new file mode 100644 index 000000000000..cb51c07bec77 --- /dev/null +++ b/net/drawterm/files/patch-posix-power_tas.c @@ -0,0 +1,27 @@ +--- posix-power/tas.c.orig 2024-01-26 17:52:14 UTC ++++ posix-power/tas.c +@@ -15,16 +15,16 @@ tas(int *x) + * r4 (x) and r5 (temp). + */ + __asm__("\n sync\n" +- " li r0,0\n" +- " mr r4,%1 /* &l->val */\n" +- " lis r5,0xdead /* assemble constant 0xdeaddead */\n" +- " ori r5,r5,0xdead /* \" */\n" ++ " li 0,0\n" ++ " mr 4,%1 /* &l->val */\n" ++ " lis 5,0xdead /* assemble constant 0xdeaddead */\n" ++ " ori 5,5,0xdead /* \" */\n" + "tas1:\n" +- " dcbf r4,r0 /* cache flush; \"fix for 603x bug\" */\n" +- " lwarx %0,r4,r0 /* v = l->val with reservation */\n" +- " cmp cr0,0,%0,r0 /* v == 0 */\n" ++ " dcbf 4,0 /* cache flush; \"fix for 603x bug\" */\n" ++ " lwarx %0,4,0 /* v = l->val with reservation */\n" ++ " cmp cr0,0,%0,0 /* v == 0 */\n" + " bne tas0\n" +- " stwcx. r5,r4,r0 /* if (l->val same) l->val = 0xdeaddead */\n" ++ " stwcx. 5,4,0 /* if (l->val same) l->val = 0xdeaddead */\n" + " bne tas1\n" + "tas0:\n" + " sync\n"