git: f48643d376a4 - main - Use MOVED_LIBS for usr/lib/libcxxrt.so.1 ObsoleteFiles.inc entry

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Dimitry Andric <dim_at_FreeBSD.org>
Date: Tue, 23 Apr 2024 17:43:34 UTC

The branch main has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=f48643d376a45529094d39db25a471a19ab40870

commit f48643d376a45529094d39db25a471a19ab40870
Author:     Dimitry Andric <dim@FreeBSD.org>
AuthorDate: 2024-04-23 17:40:29 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-04-23 17:40:29 +0000

    Use MOVED_LIBS for usr/lib/libcxxrt.so.1 ObsoleteFiles.inc entry
    
    Otherwise, the "make delete-old-libs" mechanism also deletes 32-bit
    copies, such as in /usr/lib32.
    
    Reported by:    Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
    Fixes:          911a6479e18b
---
 ObsoleteFiles.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index a4301ebdab41..02477bbebd0b 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -52,7 +52,7 @@
 # done
 
 # 20240422: remove improperly installed libcxxrt.so.1
-OLD_LIBS+=usr/lib/libcxxrt.so.1
+MOVED_LIBS+=usr/lib/libcxxrt.so.1
 
 # 20240414: unix_socketpair_test renamed
 OLD_FILES+=usr/tests/sys/kern/unix_socketpair_test