From nobody Thu Mar 06 11:08:39 2025 X-Original-To: dev-commits-ports-main@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 4Z7mr82fcFz5pQQW; Thu, 06 Mar 2025 11:08:40 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z7mr806Szz3j36; Thu, 06 Mar 2025 11:08:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741259320; 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=Fd2Ow9ybAmMKua4NhG2qTSSBjmcj9AlbJMb/YB2wvBc=; b=X2BBXFepjMnSWcOafYTJBTaRXpaH4e4hTQs1EJ+RFR3wBvSmWFBMvciQ2dxVH7eArYNUqe EEYpwxrXQBqC8lR9YFEcsvj/IsT60gU1XXNrMKuVwlACqS+qA0rpGyrndT5zdyWvQFr+lm VoFS6yxgyHpUNmF3XLciBzI4+qPu3sRB5BhZuSzyc6qrZUQjH2gW9NRo/QTDT+HNeqcR/U 2ZaB247EOx4Y4xzAggt8MUDGFxRZxFUU2XmTOOdhjDsz1167WHbd1uFjpFPXYL8EDHKTrd tv6QSO24qfygGEKU2sy7hy9PYZx+SK3B6w/oLqJtp6YFLVGKHMMDu0xD/MCHyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741259320; a=rsa-sha256; cv=none; b=slZnjS4uNcSHrNxT4a1qvMP5vmF3NGESwy2LMtkqgiB5j9Y+Q/lVGpN8WyswrWZVIYQt5W 6YLgksdZVQZ7v/DNV3pwtuTBLyH54SgU0lCE9jLYCBt3j6n3p3PnjGZiwY933ZAVAvaNBS ZT7CbUWFp6lms64aVpiVWlfxB6CjAb/p02ohCZD9wd4e3xn8GSy6o93z8Qtzb/B15FeYap jAdY0viaCvXCvfAa5wLwpvO+7bogQKLV3CbdIO93rMWoT5jTShxGEJ+RBfR0R/0uwOCuU4 v/94M2R5m+S+dYO7iJeHR7ZZ7EnK793QqiQS23rP9GNO7jMFuDjAKNgWOwpS8A== 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=1741259320; 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=Fd2Ow9ybAmMKua4NhG2qTSSBjmcj9AlbJMb/YB2wvBc=; b=bJZkxE93JZciHWWtLCf9PZ3tMqrFZQYzNdDFQvoAZI4oZsXQqqrTG7DMvcuFWfanpTdbE+ npC4LV5D9xs8kP0IAaGHQ+ONz6EBUdhRWH5wtHTaEWevPQe8MT2w4wKOEfpgPgoodFm8R4 zBsIhgWLhY8DKsv9Tr5cPHP2YlhqyRw9ORZELx0WuvqkikqYmt4ul0bkUOaGby41aycefy YnV81GVoWV00SMvssrYOQPV3hLgJllJaFaoiQkVIg8cvUf/wrHIh9QR91jFdBj6LdDjkJi L7oLs7eAB8gsikTKXd4CedTqLLuhjq6FZWPI8I9iVwENQz7JDNFlkzHPd44vog== 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 4Z7mr75fYvzn6w; Thu, 06 Mar 2025 11:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 526B8dhf024452; Thu, 6 Mar 2025 11:08:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 526B8dwh024449; Thu, 6 Mar 2025 11:08:39 GMT (envelope-from git) Date: Thu, 6 Mar 2025 11:08:39 GMT Message-Id: <202503061108.526B8dwh024449@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 682808b321a3 - main - Mk/bsd.port.mk: Setup SHLIB_PROVIDE_PATHS* vars for pkg List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 682808b321a3d0313deb97f9fd9ac72754d4d93a Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=682808b321a3d0313deb97f9fd9ac72754d4d93a commit 682808b321a3d0313deb97f9fd9ac72754d4d93a Author: Gleb Popov AuthorDate: 2025-02-26 15:19:08 +0000 Commit: Gleb Popov CommitDate: 2025-03-06 11:08:34 +0000 Mk/bsd.port.mk: Setup SHLIB_PROVIDE_PATHS* vars for pkg This changes picks a new pkg feature: https://github.com/freebsd/pkg/pull/2422 The idea behind the `.if ${LINUX_DEFAULT} ...` check comes from the Linux ld.so(8) man page that says > (5) In the default path /lib, and then /usr/lib. (On some 64-bit > architectures, the default paths for 64-bit shared objects > are /lib64, and then /usr/lib64.) CentOS 7 and Rocky Linux 9 that we have in Ports install 32 bit libraries into `/usr/lib` and 64 bit libraries into `/usr/lib64`. `/lib` and `/lib64` are symlinks, so I omitted them. Differential Revision: https://reviews.freebsd.org/D49136 Approved by: bapt --- Mk/bsd.port.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 4063193af49b..32752e31b2e6 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1882,6 +1882,18 @@ USE_LDCONFIG= ${PREFIX}/lib IGNORE= has USE_LDCONFIG32 set to yes, which is not correct . endif +_ALL_LIB_DIRS= ${LIB_DIRS} ${USE_LDCONFIG} +PKG_ENV+= SHLIB_PROVIDE_PATHS_NATIVE="${_ALL_LIB_DIRS:O:u:ts,}" +. if defined(HAVE_COMPAT_IA32_KERN) +PKG_ENV+= SHLIB_PROVIDE_PATHS_COMPAT_32="/usr/lib32,${LOCALBASE}/lib32" +. endif +. if ${LINUX_DEFAULT} == c7 || ${LINUX_DEFAULT} == rl9 +PKG_ENV+= SHLIB_PROVIDE_PATHS_COMPAT_LINUX="${LINUXBASE}/usr/lib64" +PKG_ENV+= SHLIB_PROVIDE_PATHS_COMPAT_LINUX_32="${LINUXBASE}/usr/lib" +. else +. warning "Unknown Linux distribution ${LINUX_DEFAULT}, SHLIB_PROVIDE_PATHS_COMPAT_LINUX will not be set!" +. endif + . if defined(USE_LDCONFIG) || defined(USE_LDCONFIG32) . if defined(USE_LINUX_PREFIX) PLIST_FILES+= "@ldconfig-linux ${LINUXBASE}"