From 28e64816f4b4be9b8dd11cedebe5fd517d0d0394 Mon Sep 17 00:00:00 2001 From: Konrad Witaszczyk Date: Sat, 9 Mar 2024 08:10:55 +0000 Subject: [PATCH] deve/gdb: ignore instead of disconnecting Mark the port as ignored instead of disconnecting it from the ports build system. This way a user trying to explicitly build this port will be informed that it's ignored on CheriBSD. --- devel/Makefile | 9 +-------- devel/gdb/Makefile | 2 ++ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/devel/Makefile b/devel/Makefile index 5486d72349d03..6e9c1a3ea53ac 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -741,14 +741,7 @@ SUBDIR += gcli SUBDIR += gconf2 SUBDIR += gconfmm26 -# -# devel/gdb is replaced by devel/gdb-meta that points at devel/gdb-cheri on -# CheriBSD. -# -# Do not build devel/gdb but leave it in CheriBSD ports to prevent possible -# upstream merge issues. -# -# SUBDIR += gdb + SUBDIR += gdb SUBDIR += gdb-cheri SUBDIR += gdb-meta SUBDIR += gdcm diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile index a09f58936bf21..a240d14e679db 100644 --- a/devel/gdb/Makefile +++ b/devel/gdb/Makefile @@ -1,4 +1,6 @@ .ifndef SLAVE_PORT +IGNORE= is replaced by devel/gdb-meta on CheriBSD + PORTNAME= gdb DISTVERSION= 13.1 PORTREVISION= 3