commit:     c80eba1e1f25987e05fb9724b199fdb464becb37
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 16:48:39 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 16:48:44 2025 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=c80eba1e

Revert "15.0.0: add realpath hack for C++ modules JSON location"

This reverts commit ae822d007a7120fa5856a3fe8d5f90e97eba0b55.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...-contrib-make-relpath.sh-use-GNU-realpath.patch | 33 ----------------------
 15.0.0/gentoo/README.history                       |  1 -
 2 files changed, 34 deletions(-)

diff --git 
a/15.0.0/gentoo/35_all_PR119266-contrib-make-relpath.sh-use-GNU-realpath.patch 
b/15.0.0/gentoo/35_all_PR119266-contrib-make-relpath.sh-use-GNU-realpath.patch
deleted file mode 100644
index 8278fc4..0000000
--- 
a/15.0.0/gentoo/35_all_PR119266-contrib-make-relpath.sh-use-GNU-realpath.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0a2fe8f7a000a13005688aea980b90befe917a8e Mon Sep 17 00:00:00 2001
-Message-ID: 
<0a2fe8f7a000a13005688aea980b90befe917a8e.1741860425.git....@gentoo.org>
-From: Sam James <[email protected]>
-Date: Thu, 13 Mar 2025 10:06:29 +0000
-Subject: [PATCH] contrib: make relpath.sh use GNU realpath
-
-contrib/ChangeLog:
-       PR libstdc++/119266
-
-        * relpath.sh: Use GNU realpath.
----
- contrib/relpath.sh | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/contrib/relpath.sh b/contrib/relpath.sh
-index 1b329fc04a78..3930b7730d0b 100755
---- a/contrib/relpath.sh
-+++ b/contrib/relpath.sh
-@@ -10,6 +10,9 @@ fi
- from="${1%%/}"
- to="${2%%/}"
- 
-+# XXX: Hack for https://gcc.gnu.org/PR119266
-+exec realpath --relative-to="${from}" "${to}"
-+
- # The parent directory of a pathname, handling ..
- parent() {
-     name=$(basename "$1")
-
-base-commit: d8a3944b440777d2d6fb4a9f456189a0dc439ec8
--- 
-2.48.1
-

diff --git a/15.0.0/gentoo/README.history b/15.0.0/gentoo/README.history
index 9e5a944..c66ebe8 100644
--- a/15.0.0/gentoo/README.history
+++ b/15.0.0/gentoo/README.history
@@ -1,6 +1,5 @@
 47     ????
 
-       + 35_all_PR119266-contrib-make-relpath.sh-use-GNU-realpath.patch
        - 80_all_PR81358-Enable-automatic-linking-of-libatomic.patch
 
 46     17 February 2025

Reply via email to