| 1 |
chewi 15/06/28 13:33:48 |
| 2 |
|
| 3 |
Modified: ChangeLog java-utils-2.eclass |
| 4 |
Log: |
| 5 |
The -source flag was added in 1.3 or 1.4 (not sure) and we have |
| 6 |
special code to handle this but no one in their right mind would build |
| 7 |
with 1.2 or 1.3 now. Removing this code allows the ecj-gcj ebuild to |
| 8 |
call java-pkg_javac-args without a proper VM present. |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1693 eclass/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1693&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1693&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1692&r2=1.1693 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 20 |
retrieving revision 1.1692 |
| 21 |
retrieving revision 1.1693 |
| 22 |
diff -u -r1.1692 -r1.1693 |
| 23 |
--- ChangeLog 28 Jun 2015 13:12:52 -0000 1.1692 |
| 24 |
+++ ChangeLog 28 Jun 2015 13:33:48 -0000 1.1693 |
| 25 |
@@ -1,6 +1,12 @@ |
| 26 |
# ChangeLog for eclass directory |
| 27 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1692 2015/06/28 13:12:52 johu Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1693 2015/06/28 13:33:48 chewi Exp $ |
| 30 |
+ |
| 31 |
+ 28 Jun 2015; James Le Cuirot <chewi@g.o> java-utils-2.eclass: |
| 32 |
+ The -source flag was added in 1.3 or 1.4 (not sure) and we have special code |
| 33 |
+ to handle this but no one in their right mind would build with 1.2 or 1.3 |
| 34 |
+ now. Removing this code allows the ecj-gcj ebuild to call java-pkg_javac-args |
| 35 |
+ without a proper VM present. |
| 36 |
|
| 37 |
28 Jun 2015; Johannes Huber <johu@g.o> kde5.eclass: |
| 38 |
Loop optimization as suggested by Michal Górny <mgorny@g.o> on -dev |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.165 eclass/java-utils-2.eclass |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.165&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.165&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.164&r2=1.165 |
| 47 |
|
| 48 |
Index: java-utils-2.eclass |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v |
| 51 |
retrieving revision 1.164 |
| 52 |
retrieving revision 1.165 |
| 53 |
diff -u -r1.164 -r1.165 |
| 54 |
--- java-utils-2.eclass 19 Jun 2015 14:11:24 -0000 1.164 |
| 55 |
+++ java-utils-2.eclass 28 Jun 2015 13:33:48 -0000 1.165 |
| 56 |
@@ -6,7 +6,7 @@ |
| 57 |
# |
| 58 |
# Licensed under the GNU General Public License, v2 |
| 59 |
# |
| 60 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.164 2015/06/19 14:11:24 chewi Exp $ |
| 61 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.165 2015/06/28 13:33:48 chewi Exp $ |
| 62 |
|
| 63 |
# @ECLASS: java-utils-2.eclass |
| 64 |
# @MAINTAINER: |
| 65 |
@@ -1592,11 +1592,7 @@ |
| 66 |
echo "Could not find valid -source/-target values for javac" |
| 67 |
return 1 |
| 68 |
else |
| 69 |
- if java-pkg_is-vm-version-ge "1.4"; then |
| 70 |
- echo "${source_str} ${target_str}" |
| 71 |
- else |
| 72 |
- echo "${target_str}" |
| 73 |
- fi |
| 74 |
+ echo "${source_str} ${target_str}" |
| 75 |
fi |
| 76 |
} |
| 77 |
|
| 78 |
@@ -2190,14 +2186,11 @@ |
| 79 |
continue |
| 80 |
fi |
| 81 |
|
| 82 |
- # -source was introduced in 1.3, so only check 1.3 and on |
| 83 |
- if version_is_at_least "${desired_soure}" "1.3"; then |
| 84 |
- # Verify that the compiler supports source |
| 85 |
- local supported_source=$(source ${compiler_env} 1>/dev/null 2>&1; echo ${SUPPORTED_SOURCE}) |
| 86 |
- if ! has ${desired_source} ${supported_source}; then |
| 87 |
- ewarn "${compiler} does not support -source ${desired_source}, skipping" |
| 88 |
- continue |
| 89 |
- fi |
| 90 |
+ # Verify that the compiler supports source |
| 91 |
+ local supported_source=$(source ${compiler_env} 1>/dev/null 2>&1; echo ${SUPPORTED_SOURCE}) |
| 92 |
+ if ! has ${desired_source} ${supported_source}; then |
| 93 |
+ ewarn "${compiler} does not support -source ${desired_source}, skipping" |
| 94 |
+ continue |
| 95 |
fi |
| 96 |
|
| 97 |
# if you get here, then the compiler should be good to go |
Archives