jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-26 22:23:08 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

libcxxrt: define SHLIBDIR before including bsd.own.mk

Browse Source 
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:		da77a1b4f0
This commit is contained in:
Dimitry Andric 2024-04-22 20:43:27 +02:00
parent 76a8625bc7
commit 911a6479e1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ObsoleteFiles.inc
View File

@ -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

3
lib/libcxxrt/Makefile
View File

@ -1,10 +1,11 @@
SHLIBDIR?= /lib
.include <bsd.own.mk>
PACKAGE= clibs
SRCDIR= ${SRCTOP}/contrib/libcxxrt
SHLIB_MAJOR= 1
SHLIBDIR?= /lib
.PATH: ${SRCDIR}