Magellan Linux

  • Back to homepage
    • /[smage]/trunk/extras/java6-openjdk/java6-openjdk-6.1.13.5-r1.smage2

    Diff of /trunk/extras/java6-openjdk/java6-openjdk-6.1.13.5-r1.smage2

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

    revision 23032 by niro, Tue Oct 28 13:55:52 2014 UTC revision 23033 by niro, Tue Oct 28 14:05:51 2014 UTC
    # Line 114  split_info_java6-demos-openjdk() Line 114  split_info_java6-demos-openjdk()
    114   DEPEND="== dev-java/java6-jdk-openjdk-${PVER}"   DEPEND="== dev-java/java6-jdk-openjdk-${PVER}"
    115  }  }
    116    
    117  src_prepare()  pkg_setup()
    118  {  {
    119   # warn about /proc in chroot environments   # warn about /proc in chroot environments
    120   [[ ! -d /proc/sys ]] && die "Please make sure /proc is mounted in chroot-environments."   [[ ! -d /proc/sys ]] && die "Please make sure /proc is mounted in chroot-environments."
    121    
    122   if [[ ${BOOTSTRAP} = 1 ]]   if [[ ${BOOTSTRAP} = 1 ]]
    123   then   then
    124   # must use java-gcj-compat as default jvm!   # switch to java5-gcj
    125   [[ $(java-update --get-implementation) != java5-gcj ]] &&   java-update java5-gcj
      die "please change to java5-gcj jvm: java-update java5-gcj"  
    126   else   else
    127   # must use java6 as default jvm!   # switch to java6-openjdk
    128   [[ $(java-update --get-implementation) != ${PNAME} ]] &&   java-update java6-openjdk
      die "please change to ${PNAME} jvm: java-update ${PNAME}"  
    129   fi   fi
    130    }
    131    
    132    src_prepare()
    133    {
    134    # # warn about /proc in chroot environments
    135    # [[ ! -d /proc/sys ]] && die "Please make sure /proc is mounted in chroot-environments."
    136    #
    137    # if [[ ${BOOTSTRAP} = 1 ]]
    138    # then
    139    # # must use java-gcj-compat as default jvm!
    140    # [[ $(java-update --get-implementation) != java5-gcj ]] &&
    141    # die "please change to java5-gcj jvm: java-update java5-gcj"
    142    # else
    143    # # must use java6 as default jvm!
    144    # [[ $(java-update --get-implementation) != ${PNAME} ]] &&
    145    # die "please change to ${PNAME} jvm: java-update ${PNAME}"
    146    # fi
    147    
    148   munpack ${ICEDTEA_SRCFILE} || die   munpack ${ICEDTEA_SRCFILE} || die
    149   cd ${ICEDTEA_SRCDIR}   cd ${ICEDTEA_SRCDIR}
    Legend:
    Removed from v.23032  
    changed lines
      Added in v.23033