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 9706 by niro, Thu Jan 5 16:52:17 2012 UTC revision 9709 by niro, Thu Jan 5 17:03:15 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 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
  install -d ${ICEDTEA_SRCDIR}/drops || die  
  ln -snf ${SOURCEDIR}/${PNAME}/${JAXP_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die  
  ln -snf ${SOURCEDIR}/${PNAME}/${JAXWS_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die  
  ln -snf ${SOURCEDIR}/${PNAME}/${JAF_SRCFILE} ${ICEDTEA_SRCDIR}/drops || die  
136   mautoreconf || die   mautoreconf || die
137  }  }
138    
# Line 154  src_compile() Line 155  src_compile()
155   --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \   --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
156   --with-ant-home=${ANT_HOME} \   --with-ant-home=${ANT_HOME} \
157   --with-jdk-home=${JDK_HOME} \   --with-jdk-home=${JDK_HOME} \
158     --with-jaxp-drop-zip=${SOURCEDIR}/${PNAME}/${JAXP_SRCFILE} \
159     --with-jaxws-drop-zip=${SOURCEDIR}/${PNAME}/${JAXWS_SRCFILE} \
160     --with-jaf-drop-zip=${SOURCEDIR}/${PNAME}/${JAF_SRCFILE} \
161   --disable-docs \   --disable-docs \
162   --disable-zero \   --disable-zero \
163   --disable-cacao \   --disable-cacao \

Legend:
Removed from v.9706  
changed lines
  Added in v.9709