Magellan Linux

  • Back to homepage
    • /[smage]/trunk/extras/java8-openjdk/java8-openjdk-8.3.4.0-r1.smage2

    Diff of /trunk/extras/java8-openjdk/java8-openjdk-8.3.4.0-r1.smage2

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 29417 by niro, Tue Jun 13 08:45:32 2017 UTC revision 29420 by niro, Tue Jun 13 11:12:17 2017 UTC
    # Line 12  HOMEPAGE="http://openjdk.java.net/" Line 12  HOMEPAGE="http://openjdk.java.net/"
    12  # enable bootstrap of openjdk using java5-gcj or not  # enable bootstrap of openjdk using java5-gcj or not
    13  # 0=no, 1=yes  # 0=no, 1=yes
    14  BOOTSTRAP=1  BOOTSTRAP=1
    15    # use a binary sun jdk 0=no, 1=yes
    16    BOOTSTRAP_BINARY_SUNJDK=1
    17    # use a binary openjdk 0=no, 1=yes
    18    BOOTSTRAP_BINARY_OPENJDK=0
    19    
    20  JRE_DEPEND=">= dev-java/java-environment-1  JRE_DEPEND=">= dev-java/java-environment-1
    21   >= media-libs/freetype-2.6   >= media-libs/freetype-2.6
    # Line 45  SDEPEND="${JRE_DEPEND} Line 49  SDEPEND="${JRE_DEPEND}
    49    
    50  if [[ ${BOOTSTRAP} = 1 ]]  if [[ ${BOOTSTRAP} = 1 ]]
    51  then  then
    52   SDEPEND="${SDEPEND}   if [[ ${BOOTSTRAP_BINARY_SUNJDK} = 1 ]]
    53   >= dev-java/java7-jdk-openjdk-7"   then
    54     SDEPEND="${SDEPEND}
    55     >= dev-java/java8-jdk-sun-8"
    56     elif [[ ${BOOTSTRAP_BINARY_OPENJDK} = 1 ]]
    57     then
    58     SDEPEND="${SDEPEND}
    59     >= dev-java/java8-jdk-openjdk-binary-8"
    60     else
    61     SDEPEND="${SDEPEND}
    62     >= dev-java/java7-jdk-openjdk-7"
    63     fi
    64  else  else
    65   SDEPEND="${SDEPEND}   SDEPEND="${SDEPEND}
    66   >= dev-java/java8-jdk-openjdk-${PVER%%.*}"   >= dev-java/java8-jdk-openjdk-${PVER%%.*}"
    # Line 119  SRC_URI=( Line 133  SRC_URI=(
    133   mirror://${PNAME}/${HOTSPOT_SRCFILE}   mirror://${PNAME}/${HOTSPOT_SRCFILE}
    134   mirror://${PNAME}/${LANGTOOLS_SRCFILE}   mirror://${PNAME}/${LANGTOOLS_SRCFILE}
    135   mirror://${PNAME}/${NASHORN_SRCFILE}   mirror://${PNAME}/${NASHORN_SRCFILE}
      mirror://${PNAME}/${PNAME}-8.3.4.0-gcc6.patch  
    136  )  )
    137    
    138  UP2DATE="updatecmd http://icedtea.wildebeest.org/download/source/ | grep icedtea-[0-9] | highesttarball xz | sed 's:\(.*\):7.\1:'"  UP2DATE="updatecmd http://icedtea.wildebeest.org/download/source/ | grep icedtea-[0-9] | highesttarball xz | sed 's:\(.*\):7.\1:'"
    # Line 158  pkg_setup() Line 171  pkg_setup()
    171    
    172   if [[ ${BOOTSTRAP} = 1 ]]   if [[ ${BOOTSTRAP} = 1 ]]
    173   then   then
    174   # switch to java7-openjdk   if [[ ${BOOTSTRAP_BINARY_SUNJDK} = 1 ]]
    175   java-update java7-openjdk   then
    176     # switch to java8-sun
    177     java-update java8-sun
    178     elif [[ ${BOOTSTRAP_BINARY_OPENJDK} = 1 ]]
    179     then
    180     # switch to java8-openjdk-binary
    181     java-update java8-openjdk-binary
    182     else
    183     # switch to java7-openjdk
    184     java-update java7-openjdk
    185     fi
    186   else   else
    187   # switch to java8-openjdk   # switch to java8-openjdk
    188   java-update java8-openjdk   java-update java8-openjdk
    # Line 171  src_prepare() Line 194  src_prepare()
    194   munpack ${ICEDTEA_SRCFILE} || die   munpack ${ICEDTEA_SRCFILE} || die
    195   cd ${ICEDTEA_SRCDIR}   cd ${ICEDTEA_SRCDIR}
    196    
      # fix build issues with gcc6 in icedtea  
     # mpatch ${PNAME}-8.3.4.0-gcc6.patch || die  
       
    197   ln -snf ${SOURCEDIR}/${PNAME}/${OPENJDK_SRCFILE} ${ICEDTEA_SRCDIR}/openjdk.tar.xz || die   ln -snf ${SOURCEDIR}/${PNAME}/${OPENJDK_SRCFILE} ${ICEDTEA_SRCDIR}/openjdk.tar.xz || die
    198   ln -snf ${SOURCEDIR}/${PNAME}/${JDK_SRCFILE} ${ICEDTEA_SRCDIR}/jdk.tar.xz || die   ln -snf ${SOURCEDIR}/${PNAME}/${JDK_SRCFILE} ${ICEDTEA_SRCDIR}/jdk.tar.xz || die
    199   ln -snf ${SOURCEDIR}/${PNAME}/${JAXP_SRCFILE} ${ICEDTEA_SRCDIR}/jaxp.tar.xz || die   ln -snf ${SOURCEDIR}/${PNAME}/${JAXP_SRCFILE} ${ICEDTEA_SRCDIR}/jaxp.tar.xz || die
    Legend:
    Removed from v.29417  
    changed lines
      Added in v.29420