1 |
commit: d13a6eb91812cfa9bd3c8c276b9c7af3ae2fc790 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 2 17:49:12 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 2 17:49:12 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d13a6eb9 |
7 |
|
8 |
java-utils-2.eclass: remove freebsd-libc |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
eclass/java-utils-2.eclass | 9 ++------- |
13 |
1 file changed, 2 insertions(+), 7 deletions(-) |
14 |
|
15 |
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass |
16 |
index 050a5c4847a6..d3d462aa9442 100644 |
17 |
--- a/eclass/java-utils-2.eclass |
18 |
+++ b/eclass/java-utils-2.eclass |
19 |
@@ -1,4 +1,4 @@ |
20 |
-# Copyright 2004-2021 Gentoo Authors |
21 |
+# Copyright 2004-2022 Gentoo Authors |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
|
24 |
# @ECLASS: java-utils-2.eclass |
25 |
@@ -29,8 +29,6 @@ _JAVA_UTILS_2_ECLASS=1 |
26 |
# Keep versionator inheritance in case consumers are using it implicitly. |
27 |
[[ ${EAPI} == [56] ]] && inherit eapi7-ver eutils multilib versionator |
28 |
|
29 |
-IUSE="elibc_FreeBSD" |
30 |
- |
31 |
# Make sure we use java-config-2 |
32 |
export WANT_JAVA_CONFIG="2" |
33 |
|
34 |
@@ -1689,11 +1687,8 @@ java-pkg_javac-args() { |
35 |
java-pkg_get-jni-cflags() { |
36 |
local flags="-I${JAVA_HOME}/include" |
37 |
|
38 |
- local platform="linux" |
39 |
- use elibc_FreeBSD && platform="freebsd" |
40 |
- |
41 |
# TODO do a check that the directories are valid |
42 |
- flags="${flags} -I${JAVA_HOME}/include/${platform}" |
43 |
+ flags="${flags} -I${JAVA_HOME}/include/linux" |
44 |
|
45 |
echo ${flags} |
46 |
} |