public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Benda XU" <heroxbd@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/features/prefix/standalone/
Date: Thu, 15 Jul 2021 16:53:38 +0000 (UTC)	[thread overview]
Message-ID: <1626367997.8e5e1f3ef263363ec0426ce7a8a3dec6f5f5bb5d.heroxbd@gentoo> (raw)

commit:     8e5e1f3ef263363ec0426ce7a8a3dec6f5f5bb5d
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 15 16:48:22 2021 +0000
Commit:     Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu Jul 15 16:53:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e5e1f3e

p/f/prefix/standalone/profile.bashrc: remove Debian magic.

We are Gentoo, and we unconditionally turn off Debian related tests.

The upstreaming process has stalled and we work around this bug by
hacking the profile.  Remove this when upstream figure out how to deal
with distributions.

Reference: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5047
Reference: https://gitlab.kitware.com/cmake/cmake/-/issues/18979

Bug: https://bugs.gentoo.org/733480
Closes: https://bugs.gentoo.org/757006
Closes: https://github.com/gentoo/gentoo/pull/20274

Signed-off-by: Benda Xu <heroxbd <AT> gentoo.org>

 profiles/features/prefix/standalone/profile.bashrc | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/profiles/features/prefix/standalone/profile.bashrc b/profiles/features/prefix/standalone/profile.bashrc
index 76ef2455b35..5423535d0fc 100644
--- a/profiles/features/prefix/standalone/profile.bashrc
+++ b/profiles/features/prefix/standalone/profile.bashrc
@@ -1,5 +1,5 @@
 # -*- mode: shell-script; -*-
-# Copyright 2018-2020 Gentoo Authors
+# Copyright 2018-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # RAP specific patches pending upstream:
@@ -109,4 +109,11 @@ elif [[ ${CATEGORY}/${PN} == dev-lang/php && ${EBUILD_PHASE} == prepare ]]; then
     ebegin "Prefixifying ext/iconv/config.m4 paths"
     sed -i -r "/for i in/s,(/usr(/local|)),${EPREFIX}\1,g" "${S}"/ext/iconv/config.m4
     eend $?
+elif [[ ${CATEGORY}/${PN} == dev-util/cmake && ${EBUILD_PHASE} == prepare ]]; then
+    einfo "Removing Debian magic..."
+    for f in Modules/{CMakeFindPackageMode,FindPkgConfig,GNUInstallDirs,Platform/{GNU,Linux}}.cmake; do
+	ebegin "  Updating $f"
+	sed -i -e 's,EXISTS "/etc/debian_version",FALSE,' "${S}"/$f
+	eend $?
+    done
 fi


             reply	other threads:[~2021-07-15 16:53 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-15 16:53 Benda XU [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-09-11 22:39 [gentoo-commits] repo/gentoo:master commit in: profiles/features/prefix/standalone/ James Le Cuirot
2023-03-04  2:23 Sam James
2023-02-11 22:28 James Le Cuirot
2022-06-29 14:29 Sam James
2021-06-07 15:23 Guilherme Amadio
2020-05-11  7:17 Benda XU
2020-02-12 12:16 Benda XU
2019-10-09 11:33 Benda XU
2019-10-09 10:54 Benda XU
2019-01-26 11:22 Benda XU
2018-11-15 13:38 Guilherme Amadio
2018-07-05 17:39 Guilherme Amadio
2017-08-22 11:59 Benda XU

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1626367997.8e5e1f3ef263363ec0426ce7a8a3dec6f5f5bb5d.heroxbd@gentoo \
    --to=heroxbd@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox