diff --git a/sysutils/chericat/Makefile b/sysutils/chericat/Makefile index 8c399769b8d76..169c39c602cca 100644 --- a/sysutils/chericat/Makefile +++ b/sysutils/chericat/Makefile @@ -25,7 +25,7 @@ PLIST_FILES= bin/chericat .include -.if !${ABI:Mpurecap} +.if !${MACHINE_ABI:Mpurecap} IGNORE= pure capability program .endif diff --git a/sysutils/chericat/Makefile.snapshot b/sysutils/chericat/Makefile.snapshot index 9c54bfab491c1..e948f64f21837 100644 --- a/sysutils/chericat/Makefile.snapshot +++ b/sysutils/chericat/Makefile.snapshot @@ -2,6 +2,6 @@ # # Generated by: files/gen-Makefile.snapshot.sh. # -SNAPDATE= 20231108 +SNAPDATE= 20240717 -CHERICAT_COMMIT= d45db09f82459d269a03c10112b3a62e9d430c6b +CHERICAT_COMMIT= a69d6b8af9c325a861fe5d438f3b7eb34dfaa187 diff --git a/sysutils/chericat/distinfo b/sysutils/chericat/distinfo index 94cddf73322ec..d60f8aded1be5 100644 --- a/sysutils/chericat/distinfo +++ b/sysutils/chericat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1699434323 -SHA256 (CTSRD-CHERI-chericat-0.0.d20231108-d45db09f82459d269a03c10112b3a62e9d430c6b_GH0.tar.gz) = 302027c45f889e916e816dbb69c67492fc842a87ef029e120be662460239ed45 -SIZE (CTSRD-CHERI-chericat-0.0.d20231108-d45db09f82459d269a03c10112b3a62e9d430c6b_GH0.tar.gz) = 348281 +TIMESTAMP = 1721838139 +SHA256 (CTSRD-CHERI-chericat-0.0.d20240717-a69d6b8af9c325a861fe5d438f3b7eb34dfaa187_GH0.tar.gz) = 285f064ed097cef0a42b9ceb398f49b3a34b8cabf221c5add02a12b23b904a0c +SIZE (CTSRD-CHERI-chericat-0.0.d20240717-a69d6b8af9c325a861fe5d438f3b7eb34dfaa187_GH0.tar.gz) = 358180 diff --git a/sysutils/chericat/files/patch-Makefile b/sysutils/chericat/files/patch-Makefile index 5ae86aab3bfca..6286f0a0147e6 100644 --- a/sysutils/chericat/files/patch-Makefile +++ b/sysutils/chericat/files/patch-Makefile @@ -1,12 +1,14 @@ --- Makefile.orig +++ Makefile -@@ -6,8 +6,7 @@ - CFLAGS?=-g -O0 +@@ -7,9 +7,8 @@ CFLAGS+=-Wall -Wcheri --INC=-I/usr/include -I/usr/local/include -I$(DEPS) + SRC_BASE?=/usr/src +-ARCH+=aarch64 +-INC=-I/usr/include -I/usr/local/include -I$(DEPS) -I${SRC_BASE}/libexec/rtld-elf -I${SRC_BASE}/libexec/rtld-elf/${ARCH} -LDFLAGS=-L/usr/lib -L/usr/local/lib -+INC=-I$(DEPS) ++ARCH?=aarch64 ++INC=-I$(DEPS) -I${SRC_BASE}/libexec/rtld-elf -I${SRC_BASE}/libexec/rtld-elf/${ARCH} .PHONY: all .PHONY: make_dir