chewi 15/06/28 13:33:48 Modified: ChangeLog java-utils-2.eclass Log: The -source flag was added in 1.3 or 1.4 (not sure) and we have special code to handle this but no one in their right mind would build with 1.2 or 1.3 now. Removing this code allows the ecj-gcj ebuild to call java-pkg_javac-args without a proper VM present.
Revision Changes Path 1.1693 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1693&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1693&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1692&r2=1.1693 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1692 retrieving revision 1.1693 diff -u -r1.1692 -r1.1693 --- ChangeLog 28 Jun 2015 13:12:52 -0000 1.1692 +++ ChangeLog 28 Jun 2015 13:33:48 -0000 1.1693 @@ -1,6 +1,12 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1692 2015/06/28 13:12:52 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1693 2015/06/28 13:33:48 chewi Exp $ + + 28 Jun 2015; James Le Cuirot <[email protected]> java-utils-2.eclass: + The -source flag was added in 1.3 or 1.4 (not sure) and we have special code + to handle this but no one in their right mind would build with 1.2 or 1.3 + now. Removing this code allows the ecj-gcj ebuild to call java-pkg_javac-args + without a proper VM present. 28 Jun 2015; Johannes Huber <[email protected]> kde5.eclass: Loop optimization as suggested by Michal Górny <[email protected]> on -dev 1.165 eclass/java-utils-2.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.165&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?rev=1.165&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-utils-2.eclass?r1=1.164&r2=1.165 Index: java-utils-2.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- java-utils-2.eclass 19 Jun 2015 14:11:24 -0000 1.164 +++ java-utils-2.eclass 28 Jun 2015 13:33:48 -0000 1.165 @@ -6,7 +6,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.164 2015/06/19 14:11:24 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.165 2015/06/28 13:33:48 chewi Exp $ # @ECLASS: java-utils-2.eclass # @MAINTAINER: @@ -1592,11 +1592,7 @@ echo "Could not find valid -source/-target values for javac" return 1 else - if java-pkg_is-vm-version-ge "1.4"; then - echo "${source_str} ${target_str}" - else - echo "${target_str}" - fi + echo "${source_str} ${target_str}" fi } @@ -2190,14 +2186,11 @@ continue fi - # -source was introduced in 1.3, so only check 1.3 and on - if version_is_at_least "${desired_soure}" "1.3"; then - # Verify that the compiler supports source - local supported_source=$(source ${compiler_env} 1>/dev/null 2>&1; echo ${SUPPORTED_SOURCE}) - if ! has ${desired_source} ${supported_source}; then - ewarn "${compiler} does not support -source ${desired_source}, skipping" - continue - fi + # Verify that the compiler supports source + local supported_source=$(source ${compiler_env} 1>/dev/null 2>&1; echo ${SUPPORTED_SOURCE}) + if ! has ${desired_source} ${supported_source}; then + ewarn "${compiler} does not support -source ${desired_source}, skipping" + continue fi # if you get here, then the compiler should be good to go
