From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1700269-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 893671581F0
for <garchives@archives.gentoo.org>; Sat, 14 Dec 2024 17:34:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A6770E0829;
Sat, 14 Dec 2024 17:34:04 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 85F3BE0829
for <gentoo-commits@lists.gentoo.org>; Sat, 14 Dec 2024 17:34:04 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 793E9340C9C
for <gentoo-commits@lists.gentoo.org>; Sat, 14 Dec 2024 17:34:03 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 1006FAF5
for <gentoo-commits@lists.gentoo.org>; Sat, 14 Dec 2024 17:34:02 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1734197621.2b03957f90dc4c5ae3df044aaacbe95143b4591d.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-build/cmake/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-build/cmake/cmake-3.31.2.ebuild dev-build/cmake/cmake-9999.ebuild
X-VCS-Directories: dev-build/cmake/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 2b03957f90dc4c5ae3df044aaacbe95143b4591d
X-VCS-Branch: master
Date: Sat, 14 Dec 2024 17:34:02 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1cecae67-ea02-4c70-aa44-ea5a27c039a9
X-Archives-Hash: 92b4d383d2277837ed0dd30b3b1fb96d
commit: 2b03957f90dc4c5ae3df044aaacbe95143b4591d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 17:32:36 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 17:33:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b03957f
dev-build/cmake: add warning on bad /etc/*-release files
Prompted by (yet another) post on this, see https://forums.gentoo.org/viewtopic-t-1170229.html.
Bug: https://bugs.gentoo.org/599684
Bug: https://bugs.gentoo.org/753581
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-build/cmake/cmake-3.31.2.ebuild | 11 +++++++++++
dev-build/cmake/cmake-9999.ebuild | 11 +++++++++++
2 files changed, 22 insertions(+)
diff --git a/dev-build/cmake/cmake-3.31.2.ebuild b/dev-build/cmake/cmake-3.31.2.ebuild
index e9982cd799b4..77333d9623b1 100644
--- a/dev-build/cmake/cmake-3.31.2.ebuild
+++ b/dev-build/cmake/cmake-3.31.2.ebuild
@@ -277,6 +277,17 @@ src_install() {
}
pkg_postinst() {
+ if [[ -z ${EPREFIX} ]] ; then
+ local file
+ # See bug #599684 and bug #753581 (at least)
+ for file in /etc/arch-release /etc/redhat-release /etc/debian_version ; do
+ eerror "Errant ${file} found!"
+ eerror "The presence of these files is known to confuse CMake's"
+ eerror "library path logic. Please (re)move this file:"
+ eerror " mv ${file} ${file}.bak"
+ done
+ fi
+
if use gui; then
xdg_icon_cache_update
xdg_desktop_database_update
diff --git a/dev-build/cmake/cmake-9999.ebuild b/dev-build/cmake/cmake-9999.ebuild
index 57684e5cd229..214e75342d3c 100644
--- a/dev-build/cmake/cmake-9999.ebuild
+++ b/dev-build/cmake/cmake-9999.ebuild
@@ -278,6 +278,17 @@ src_install() {
}
pkg_postinst() {
+ if [[ -z ${EPREFIX} ]] ; then
+ local file
+ # See bug #599684 and bug #753581 (at least)
+ for file in /etc/arch-release /etc/redhat-release /etc/debian_version ; do
+ eerror "Errant ${file} found!"
+ eerror "The presence of these files is known to confuse CMake's"
+ eerror "library path logic. Please (re)move this file:"
+ eerror " mv ${file} ${file}.bak"
+ done
+ fi
+
if use gui; then
xdg_icon_cache_update
xdg_desktop_database_update