Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 514668 | Differences between
and this patch

Collapse All | Expand All

(-)scilab-5.5.0/build.incl.xml.orig (-1 / +2 lines)
Lines 85-96 Link Here
85
        <!-- Check the version of Java. If it changes after the configure
85
        <!-- Check the version of Java. If it changes after the configure
86
         or if there is a mistake in the build system
86
         or if there is a mistake in the build system
87
    -->
87
    -->
88
        <fail message="JDK 1.6 or 1.7 required. Found ${ant.java.version}">
88
        <fail message="JDK 1.6, 1.7 or 1.8 required. Found ${ant.java.version}">
89
            <condition>
89
            <condition>
90
                <not>
90
                <not>
91
                    <or>
91
                    <or>
92
                        <equals arg1="${ant.java.version}" arg2="1.6"/>
92
                        <equals arg1="${ant.java.version}" arg2="1.6"/>
93
                        <equals arg1="${ant.java.version}" arg2="1.7"/>
93
                        <equals arg1="${ant.java.version}" arg2="1.7"/>
94
                        <equals arg1="${ant.java.version}" arg2="1.8"/>
94
                    </or>
95
                    </or>
95
                </not>
96
                </not>
96
            </condition>
97
            </condition>

Return to bug 514668