Magellan Linux

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 9708 by niro, Thu Jan 5 17:00:52 2012 UTC
# Line 70  JAXP_SRCFILE="jdk6-jaxp-${JAXP_PVER}.zip Line 70  JAXP_SRCFILE="jdk6-jaxp-${JAXP_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 128  src_prepare() Line 128  src_prepare()
128   mpatch ${PNAME}-${PVER}-xerces211.patch || die   mpatch ${PNAME}-${PVER}-xerces211.patch || die
129    
130   ln -snf ${SOURCEDIR}/${PNAME}/${OPENJDK_SRCFILE} ${ICEDTEA_SRCDIR} || die   ln -snf ${SOURCEDIR}/${PNAME}/${OPENJDK_SRCFILE} ${ICEDTEA_SRCDIR} || die
  ln -snf ${SOURCEDIR}/${PNAME}/${JAXP_SRCFILE} ${ICEDTEA_SRCDIR} || die  
  ln -snf ${SOURCEDIR}/${PNAME}/${JAXWS_SRCFILE} ${ICEDTEA_SRCDIR} || die  
  ln -snf ${SOURCEDIR}/${PNAME}/${JAF_SRCFILE} ${ICEDTEA_SRCDIR} || die  
131   mautoreconf || die   mautoreconf || die
132  }  }
133    
# Line 152  src_compile() Line 149  src_compile()
149   --with-pkgversion="Magellan-Linux ${PVER} ${ARCH}" \   --with-pkgversion="Magellan-Linux ${PVER} ${ARCH}" \
150   --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \   --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
151   --with-ant-home=${ANT_HOME} \   --with-ant-home=${ANT_HOME} \
152   --with-jdk-home=${JDKHOME} \   --with-jdk-home=${JDK_HOME} \
153     --with-jaxp-drop-zip=${SOURCEDIR}/${PNAME}/${JAXP_SRCFILE} \
154     --with-jaxws-drop-zip=${SOURCEDIR}/${PNAME}/${JAXWS_SRCFILE} \
155     --with-jaf-drop-zip=${SOURCEDIR}/${PNAME}/${JAF_SRCFILE} \
156   --disable-docs \   --disable-docs \
157   --disable-zero \   --disable-zero \
158   --disable-cacao \   --disable-cacao \

Legend:
Removed from v.9704  
changed lines
  Added in v.9708