1 |
commit: 6f541b586a91954d1083cf1f105c8e32ea7362d4 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jul 31 18:55:27 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 31 20:42:08 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f541b58 |
7 |
|
8 |
toolchain.eclass: drop java binary renames for <gcc-4 |
9 |
|
10 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
11 |
|
12 |
eclass/toolchain.eclass | 41 ----------------------------------------- |
13 |
1 file changed, 41 deletions(-) |
14 |
|
15 |
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass |
16 |
index 613f91761d7..a4cb9cc141e 100644 |
17 |
--- a/eclass/toolchain.eclass |
18 |
+++ b/eclass/toolchain.eclass |
19 |
@@ -491,12 +491,6 @@ toolchain_src_prepare() { |
20 |
fi |
21 |
fi |
22 |
|
23 |
- # In gcc 3.3.x and 3.4.x, rename the java bins to gcc-specific names |
24 |
- # in line with gcc-4. |
25 |
- if tc_version_is_between 3.3 4.0 ; then |
26 |
- do_gcc_rename_java_bins |
27 |
- fi |
28 |
- |
29 |
# Prevent libffi from being installed |
30 |
if tc_version_is_between 3.0 4.8 ; then |
31 |
sed -i -e 's/\(install.*:\) install-.*recursive/\1/' "${S}"/libffi/Makefile.in || die |
32 |
@@ -711,41 +705,6 @@ gcc_version_patch() { |
33 |
sed -i "${gcc_sed[@]}" "${S}"/gcc/version.c || die |
34 |
} |
35 |
|
36 |
-do_gcc_rename_java_bins() { |
37 |
- # bug #139918 - conflict between gcc and java-config-2 for ownership of |
38 |
- # /usr/bin/rmi{c,registry}. Done with mv & sed rather than a patch |
39 |
- # because patches would be large (thanks to the rename of man files), |
40 |
- # and it's clear from the sed invocations that all that changes is the |
41 |
- # rmi{c,registry} names to grmi{c,registry} names. |
42 |
- # Kevin F. Quinn 2006-07-12 |
43 |
- einfo "Renaming jdk executables rmic and rmiregistry to grmic and grmiregistry." |
44 |
- # 1) Move the man files if present (missing prior to gcc-3.4) |
45 |
- for manfile in rmic rmiregistry ; do |
46 |
- [[ -f ${S}/gcc/doc/${manfile}.1 ]] || continue |
47 |
- mv "${S}"/gcc/doc/${manfile}.1 "${S}"/gcc/doc/g${manfile}.1 |
48 |
- done |
49 |
- # 2) Fixup references in the docs if present (mission prior to gcc-3.4) |
50 |
- for jfile in gcc/doc/gcj.info gcc/doc/grmic.1 gcc/doc/grmiregistry.1 gcc/java/gcj.texi ; do |
51 |
- [[ -f ${S}/${jfile} ]] || continue |
52 |
- sed -i -e 's:rmiregistry:grmiregistry:g' "${S}"/${jfile} || |
53 |
- die "Failed to fixup file ${jfile} for rename to grmiregistry" |
54 |
- sed -i -e 's:rmic:grmic:g' "${S}"/${jfile} || |
55 |
- die "Failed to fixup file ${jfile} for rename to grmic" |
56 |
- done |
57 |
- # 3) Fixup Makefiles to build the changed executable names |
58 |
- # These are present in all 3.x versions, and are the important bit |
59 |
- # to get gcc to build with the new names. |
60 |
- for jfile in libjava/Makefile.am libjava/Makefile.in gcc/java/Make-lang.in ; do |
61 |
- sed -i -e 's:rmiregistry:grmiregistry:g' "${S}"/${jfile} || |
62 |
- die "Failed to fixup file ${jfile} for rename to grmiregistry" |
63 |
- # Careful with rmic on these files; it's also the name of a directory |
64 |
- # which should be left unchanged. Replace occurrences of 'rmic$', |
65 |
- # 'rmic_' and 'rmic '. |
66 |
- sed -i -e 's:rmic\([$_ ]\):grmic\1:g' "${S}"/${jfile} || |
67 |
- die "Failed to fixup file ${jfile} for rename to grmic" |
68 |
- done |
69 |
-} |
70 |
- |
71 |
#---->> src_configure <<---- |
72 |
|
73 |
toolchain_src_configure() { |