Magellan Linux

  • Back to homepage
    • /[smage]/branches/magellan-next/core/openjdk/openjdk-6.1.10.4-r1.smage2

    Diff of /branches/magellan-next/core/openjdk/openjdk-6.1.10.4-r1.smage2

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

    revision 9704 by niro, Thu Jan 5 16:40:37 2012 UTC revision 9712 by niro, Thu Jan 5 17:11:44 2012 UTC
    # Line 61  OPENJDK_PVER="b22-28_feb_2011" Line 61  OPENJDK_PVER="b22-28_feb_2011"
    61  OPENJDK_SRCFILE="openjdk-${PVER:0:1}-src-${OPENJDK_PVER}.tar.gz"  OPENJDK_SRCFILE="openjdk-${PVER:0:1}-src-${OPENJDK_PVER}.tar.gz"
    62    
    63  # hardcoded jaxws pver  # hardcoded jaxws pver
    64  JAXWS_PVER="144_01"  JAXP_PVER="144_01"
    65  JAXWS_SRCFILE="jaxp${JAXWS_PVER}.zip"  JAXP_SRCFILE="jaxp${JAXP_PVER}.zip"
    66    
    67  # hardcoded jaxp pver  # hardcoded jaxp pver
    68  JAXP_PVER="b20"  JAXWS_PVER="b20"
    69  JAXP_SRCFILE="jdk6-jaxp-${JAXP_PVER}.zip"  JAXWS_SRCFILE="jdk6-jaxws-${JAXWS_PVER}.zip"
    70    
    71  # hardcoded jaf pver  # hardcoded jaf pver
    72  JAF_PVER="b20"  JAF_PVER="b20"
    73  JAF_SRCFILE="jdk6-jaf-${JAF_PVER}zip"  JAF_SRCFILE="jdk6-jaf-${JAF_PVER}.zip"
    74    
    75  sminclude mtools xdg  sminclude mtools xdg
    76    
    77  SRC_URI=(  SRC_URI=(
    78   http://download.java.net/openjdk/jdk6/promoted/b${PVER##*.}/${OPENJDK_SRCFILE}   http://download.java.net/openjdk/jdk6/promoted/${OPENJDK_PVER%-*}/${OPENJDK_SRCFILE}
    79   http://icedtea.classpath.org/download/source/${ICEDTEA_SRCFILE}   http://icedtea.classpath.org/download/source/${ICEDTEA_SRCFILE}
    80   #http://icedtea.classpath.org/download/source/${ICEDTEA_WEB_SRCFILE}   #http://icedtea.classpath.org/download/source/${ICEDTEA_WEB_SRCFILE}
    81   http://icedtea.classpath.org/download/drops/${JAXP_SRCFILE}   http://icedtea.classpath.org/download/drops/${JAXP_SRCFILE}
    # Line 111  split_info_openjdk-jdk() Line 111  split_info_openjdk-jdk()
    111   PROVIDE="virtual/java-jdk"   PROVIDE="virtual/java-jdk"
    112  }  }
    113    
    114  split_info_openjdk-jdk()  split_info_openjdk-src()
    115  {  {
    116   DESCRIPTION="OpenJDK Java Development Kit ${PVER} with IcedTea plugins and classes."   DESCRIPTION="OpenJDK developmend source."
    117   DEPEND="== dev-java/openjdk-jre-${PVER}"   DEPEND="== dev-java/openjdk-jdk-${PVER}"
    118   PROVIDE="virtual/java-jdk"  }
    119    
    120    split_info_openjdk-demos()
    121    {
    122     DESCRIPTION="OpenJDK samples and demos."
    123     DEPEND="== dev-java/openjdk-jdk-${PVER}"
    124  }  }
    125    
    126  src_prepare()  src_prepare()
    # Line 128  src_prepare() Line 133  src_prepare()
    133   mpatch ${PNAME}-${PVER}-xerces211.patch || die   mpatch ${PNAME}-${PVER}-xerces211.patch || die
    134    
    135   ln -snf ${SOURCEDIR}/${PNAME}/${OPENJDK_SRCFILE} ${ICEDTEA_SRCDIR} || die   ln -snf ${SOURCEDIR}/${PNAME}/${OPENJDK_SRCFILE} ${ICEDTEA_SRCDIR} || die
    136   ln -snf ${SOURCEDIR}/${PNAME}/${JAXP_SRCFILE} ${ICEDTEA_SRCDIR} || die   install -d ${ICEDTEA_SRCDIR}/drops || die
    137   ln -snf ${SOURCEDIR}/${PNAME}/${JAXWS_SRCFILE} ${ICEDTEA_SRCDIR} || die   cp ${SOURCEDIR}/${PNAME}/${JAXP_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die
    138   ln -snf ${SOURCEDIR}/${PNAME}/${JAF_SRCFILE} ${ICEDTEA_SRCDIR} || die   cp ${SOURCEDIR}/${PNAME}/${JAXWS_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die
    139     cp ${SOURCEDIR}/${PNAME}/${JAF_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die
    140   mautoreconf || die   mautoreconf || die
    141  }  }
    142    
    # Line 152  src_compile() Line 158  src_compile()
    158   --with-pkgversion="Magellan-Linux ${PVER} ${ARCH}" \   --with-pkgversion="Magellan-Linux ${PVER} ${ARCH}" \
    159   --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \   --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
    160   --with-ant-home=${ANT_HOME} \   --with-ant-home=${ANT_HOME} \
    161   --with-jdk-home=${JDKHOME} \   --with-jdk-home=${JDK_HOME} \
    162   --disable-docs \   --disable-docs \
    163   --disable-zero \   --disable-zero \
    164   --disable-cacao \   --disable-cacao \
    Legend:
    Removed from v.9704  
    changed lines
      Added in v.9712