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 9706 by niro, Thu Jan 5 16:52:17 2012 UTC revision 9713 by niro, Thu Jan 5 18:24:01 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 89  SRC_URI=( Line 89  SRC_URI=(
    89   mirror://${PNAME}/${JAF_SRCFILE}   mirror://${PNAME}/${JAF_SRCFILE}
    90   mirror://${PNAME}/${PNAME}-${PVER}-xerces211.patch   mirror://${PNAME}/${PNAME}-${PVER}-xerces211.patch
    91   mirror://${PNAME}/${PNAME}-${PVER}-fix-cmds.patch   mirror://${PNAME}/${PNAME}-${PVER}-fix-cmds.patch
    92     mirror://${PNAME}/${PNAME}-${PVER}-hardcoded-test-cmds.patch
    93   #mirror://${PNAME}/${PNAME}-${PVER}-nonreparenting-wm.patch   #mirror://${PNAME}/${PNAME}-${PVER}-nonreparenting-wm.patch
    94   mirror://${PNAME}/${PNAME}-${PVER}-fontconfig.patch   mirror://${PNAME}/${PNAME}-${PVER}-fontconfig.patch
    95  )  )
    # Line 111  split_info_openjdk-jdk() Line 112  split_info_openjdk-jdk()
    112   PROVIDE="virtual/java-jdk"   PROVIDE="virtual/java-jdk"
    113  }  }
    114    
    115  split_info_openjdk-jdk()  split_info_openjdk-src()
    116  {  {
    117   DESCRIPTION="OpenJDK Java Development Kit ${PVER} with IcedTea plugins and classes."   DESCRIPTION="OpenJDK developmend source."
    118   DEPEND="== dev-java/openjdk-jre-${PVER}"   DEPEND="== dev-java/openjdk-jdk-${PVER}"
    119   PROVIDE="virtual/java-jdk"  }
    120    
    121    split_info_openjdk-demos()
    122    {
    123     DESCRIPTION="OpenJDK samples and demos."
    124     DEPEND="== dev-java/openjdk-jdk-${PVER}"
    125  }  }
    126    
    127  src_prepare()  src_prepare()
    # Line 129  src_prepare() Line 135  src_prepare()
    135    
    136   ln -snf ${SOURCEDIR}/${PNAME}/${OPENJDK_SRCFILE} ${ICEDTEA_SRCDIR} || die   ln -snf ${SOURCEDIR}/${PNAME}/${OPENJDK_SRCFILE} ${ICEDTEA_SRCDIR} || die
    137   install -d ${ICEDTEA_SRCDIR}/drops || die   install -d ${ICEDTEA_SRCDIR}/drops || die
    138   ln -snf ${SOURCEDIR}/${PNAME}/${JAXP_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die   cp ${SOURCEDIR}/${PNAME}/${JAXP_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die
    139   ln -snf ${SOURCEDIR}/${PNAME}/${JAXWS_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die   cp ${SOURCEDIR}/${PNAME}/${JAXWS_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die
    140   ln -snf ${SOURCEDIR}/${PNAME}/${JAF_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die   cp ${SOURCEDIR}/${PNAME}/${JAF_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die
    141   mautoreconf || die   mautoreconf || die
    142  }  }
    143    
    # Line 170  src_compile() Line 176  src_compile()
    176   # apply our patches here   # apply our patches here
    177   cd ${ICEDTEA_SRCDIR}/openjdk   cd ${ICEDTEA_SRCDIR}/openjdk
    178   mpatch ${PNAME}-${PVER}-fix-cmds.patch || die   mpatch ${PNAME}-${PVER}-fix-cmds.patch || die
    179     mpatch ${PNAME}-${PVER}-hardcoded-test-cmds.patch || die
    180   #mpatch ${PNAME}-${PVER}-nonreparenting-wm.patch || die   #mpatch ${PNAME}-${PVER}-nonreparenting-wm.patch || die
    181   mpatch ${PNAME}-${PVER}-fontconfig.patch || die   mpatch ${PNAME}-${PVER}-fontconfig.patch || die
    182   cd ${ICEDTEA_SRCDIR}   cd ${ICEDTEA_SRCDIR}
    Legend:
    Removed from v.9706  
    changed lines
      Added in v.9713