From 911a6479e18bcaa7010c7328f491ea338c5f381c Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Mon, 22 Apr 2024 20:43:27 +0200
Subject: [PATCH] libcxxrt: define SHLIBDIR before including bsd.own.mk

Otherwise bsd.own.mk overrides it, causing libcxxrt.so.1 to be
erroneously installed into /usr/lib.

Also add an ObsoleteFiles.inc entry, for removing the bad copy.

Reported by:	Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Fixes:		da77a1b4f0df
---
 ObsoleteFiles.inc     | 3 +++
 lib/libcxxrt/Makefile | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 8a9cf20beef5..a4301ebdab41 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20240422: remove improperly installed libcxxrt.so.1
+OLD_LIBS+=usr/lib/libcxxrt.so.1
+
 # 20240414: unix_socketpair_test renamed
 OLD_FILES+=usr/tests/sys/kern/unix_socketpair_test
 
diff --git a/lib/libcxxrt/Makefile b/lib/libcxxrt/Makefile
index 57f41e9bf59b..afae306e7bbe 100644
--- a/lib/libcxxrt/Makefile
+++ b/lib/libcxxrt/Makefile
@@ -1,10 +1,11 @@
+SHLIBDIR?=	/lib
+
 .include <bsd.own.mk>
 
 PACKAGE=	clibs
 SRCDIR=		${SRCTOP}/contrib/libcxxrt
 
 SHLIB_MAJOR=	1
-SHLIBDIR?=	/lib
 
 .PATH: ${SRCDIR}