From nobody Mon Apr 22 18:49:52 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNZ745MhLz5Hfl5; Mon, 22 Apr 2024 18:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNZ744r7vz4bNB; Mon, 22 Apr 2024 18:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713811792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jgw49yU5twjNCKG8ZDFa0eRw+r7baVOfm3SPt67TiQU=; b=wZi8j8mUv5pjdCWOJSCsqV0n1KsovlG4iVl+oljmjQ5Kd6Hm7i7irOi2GEKSPhc/WSdk3l /QTyHRXdw++PXQXNhycOyupLvVYak+v2bhtRiZ5le+Zveuor9cQOJ2MXJtK/v3NY2jP0vD v8cNf7e2zHmHKCKbgyiddI/BUdOZJJ9KFqQHS5ctg2CMmqZC8iLjOd4N+Th78nYbu8u+wN luE2ZqsDgAm8/b7pJX6A6htY8jgsw76JfQ10Fltq9r7OC+UTHY7N1Oqlemkowsdqq3lFSe 0pPXUdVIj/O77PXGjXYEaEG/17wHpIElz0G+HY4CM1uG9PYWbiFGThJYAEvW6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713811792; a=rsa-sha256; cv=none; b=y0WjczjAZflA+stGayjTcFMiHlA8kNbSs3xdZTSHKBbR/1FQa9YAWJVRg3dlz25ahYTyWc 7aX69xM4uDLCfDdgOO1UcSjpFtibBZWZcd+FLuUGEuFCP2JEQf0hjgn2ydb0ZWRy1yC3SS /3yoT3+WHx2TH+tF8Z6OIupNf0mOHB+4e+Mm0HN1CPLbf/gvYzu3gXNajGZMyydoIwjBvt s47H1Gsnj0wOiD4sxhB2frFkHk7R3/mivtMzCXlxLz7JGXWa1j8nxtlwdBOHOxmovbkUC1 00YJFt2atRLTwpUDKkZWt9k6pm8Uhe9Y8VyrvuoY/2EjcnM76u9s0xw+pcW6bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713811792; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jgw49yU5twjNCKG8ZDFa0eRw+r7baVOfm3SPt67TiQU=; b=K6QKGUDGgPCztcpdLPAexcmAOyyUmpO70iGRkn40rWJOUO3PL8L/32aPwqdRyawFkc+Sng basN3TRoFa3GJznaoBSvf1ynT6URLYMl4LqzhKIrdyLsHOIdU6sqmZlDqSO6Kp88NAmRUB Im298Gh1vele/tcFq9MlW8iFAlgaWHEiaQZOofeUQA6qWWnw3V4tzqHOSb/h6ZYuPiQ/xr thZaSAEL0Iz2Xu5UoBAIb8S/6jZfRx/AzW8EjnBwtnnygo9+m6kFr9r19gDU0iXveEW4dd CTDRkGeHDT327rByReOK0c+G+ibcK98AYCvbXdVmUYvMr06RGFumk1I2Y7JNpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNZ744RWYz10Zl; Mon, 22 Apr 2024 18:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43MInq76030940; Mon, 22 Apr 2024 18:49:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MInqCP030937; Mon, 22 Apr 2024 18:49:52 GMT (envelope-from git) Date: Mon, 22 Apr 2024 18:49:52 GMT Message-Id: <202404221849.43MInqCP030937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 911a6479e18b - main - libcxxrt: define SHLIBDIR before including bsd.own.mk List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 911a6479e18bcaa7010c7328f491ea338c5f381c Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=911a6479e18bcaa7010c7328f491ea338c5f381c commit 911a6479e18bcaa7010c7328f491ea338c5f381c Author: Dimitry Andric AuthorDate: 2024-04-22 18:43:27 +0000 Commit: Dimitry Andric CommitDate: 2024-04-22 18:46:45 +0000 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 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 PACKAGE= clibs SRCDIR= ${SRCTOP}/contrib/libcxxrt SHLIB_MAJOR= 1 -SHLIBDIR?= /lib .PATH: ${SRCDIR}