Magellan Linux

Diff of /trunk/extras/java8-openjdk/java8-openjdk-8.3.4.0-r1.smage2

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

revision 29406 by niro, Mon Jun 12 14:18:46 2017 UTC revision 29420 by niro, Tue Jun 13 11:12:17 2017 UTC
# Line 11  HOMEPAGE="http://openjdk.java.net/" Line 11  HOMEPAGE="http://openjdk.java.net/"
11    
12  # enable bootstrap of openjdk using java5-gcj or not  # enable bootstrap of openjdk using java5-gcj or not
13  # 0=no, 1=yes  # 0=no, 1=yes
14  BOOTSTRAP=0  BOOTSTRAP=1
15    # use a binary sun jdk 0=no, 1=yes
16    BOOTSTRAP_BINARY_SUNJDK=1
17    # use a binary openjdk 0=no, 1=yes
18    BOOTSTRAP_BINARY_OPENJDK=0
19    
20  JRE_DEPEND=">= dev-java/java-environment-1  JRE_DEPEND=">= dev-java/java-environment-1
21   >= media-libs/freetype-2.6   >= media-libs/freetype-2.6
# Line 45  SDEPEND="${JRE_DEPEND} Line 49  SDEPEND="${JRE_DEPEND}
49    
50  if [[ ${BOOTSTRAP} = 1 ]]  if [[ ${BOOTSTRAP} = 1 ]]
51  then  then
52   SDEPEND="${SDEPEND}   if [[ ${BOOTSTRAP_BINARY_SUNJDK} = 1 ]]
53   >= sys-dev/java-gcj-compat-1.0.80"   then
54     SDEPEND="${SDEPEND}
55     >= dev-java/java8-jdk-sun-8"
56     elif [[ ${BOOTSTRAP_BINARY_OPENJDK} = 1 ]]
57     then
58     SDEPEND="${SDEPEND}
59     >= dev-java/java8-jdk-openjdk-binary-8"
60     else
61     SDEPEND="${SDEPEND}
62     >= dev-java/java7-jdk-openjdk-7"
63     fi
64  else  else
65   SDEPEND="${SDEPEND}   SDEPEND="${SDEPEND}
66   >= dev-java/java7-jdk-openjdk-${PVER%%.*}"   >= dev-java/java8-jdk-openjdk-${PVER%%.*}"
67  fi  fi
68    
69  # provided java version  # provided java version
70  JAVA_PVER="1.8.0-openjdk-${PVER}"  JAVA_PVER="1.8.0-openjdk-${PVER}"
71    
72    JDK_UPDATE="131"
73    JDK_BUILD="b11"
74    
75  # icedtea7  # icedtea7
76  # http://icedtea.classpath.org/wiki/Main_Page  # http://icedtea.classpath.org/wiki/Main_Page
77  ICEDTEA_PVER="${PVER/8.}"  ICEDTEA_PVER="${PVER/8.}"
# Line 116  SRC_URI=( Line 133  SRC_URI=(
133   mirror://${PNAME}/${HOTSPOT_SRCFILE}   mirror://${PNAME}/${HOTSPOT_SRCFILE}
134   mirror://${PNAME}/${LANGTOOLS_SRCFILE}   mirror://${PNAME}/${LANGTOOLS_SRCFILE}
135   mirror://${PNAME}/${NASHORN_SRCFILE}   mirror://${PNAME}/${NASHORN_SRCFILE}
  mirror://${PNAME}/${PNAME}-8.3.4.0-gcc6.patch  
136  )  )
137    
138  UP2DATE="updatecmd http://icedtea.wildebeest.org/download/source/ | grep icedtea-[0-9] | highesttarball xz | sed 's:\(.*\):7.\1:'"  UP2DATE="updatecmd http://icedtea.wildebeest.org/download/source/ | grep icedtea-[0-9] | highesttarball xz | sed 's:\(.*\):7.\1:'"
# Line 155  pkg_setup() Line 171  pkg_setup()
171    
172   if [[ ${BOOTSTRAP} = 1 ]]   if [[ ${BOOTSTRAP} = 1 ]]
173   then   then
174   # switch to java5-gcj   if [[ ${BOOTSTRAP_BINARY_SUNJDK} = 1 ]]
175   java-update java5-gcj   then
176     # switch to java8-sun
177     java-update java8-sun
178     elif [[ ${BOOTSTRAP_BINARY_OPENJDK} = 1 ]]
179     then
180     # switch to java8-openjdk-binary
181     java-update java8-openjdk-binary
182     else
183     # switch to java7-openjdk
184     java-update java7-openjdk
185     fi
186   else   else
187   # switch to java7-openjdk   # switch to java8-openjdk
188   java-update java7-openjdk   java-update java8-openjdk
189   fi   fi
190  }  }
191    
192  src_prepare()  src_prepare()
193  {  {
 # # warn about /proc in chroot environments  
 # [[ ! -d /proc/sys ]] && die "Please make sure /proc is mounted in chroot-environments."  
 #  
 # if [[ ${BOOTSTRAP} = 1 ]]  
 # then  
 # # must use java-gcj-compat as default jvm!  
 # [[ $(java-update --get-implementation) != java5-gcj ]] &&  
 # die "please change to java5-gcj jvm: java-update java5-gcj"  
 # else  
 # # must use java7 as default jvm!  
 # [[ $(java-update --get-implementation) != ${PNAME} ]] &&  
 # die "please change to ${PNAME} jvm: java-update ${PNAME}"  
 # fi  
   
194   munpack ${ICEDTEA_SRCFILE} || die   munpack ${ICEDTEA_SRCFILE} || die
195   cd ${ICEDTEA_SRCDIR}   cd ${ICEDTEA_SRCDIR}
196    
197   # fix build issues with gcc6 in icedtea   ln -snf ${SOURCEDIR}/${PNAME}/${OPENJDK_SRCFILE} ${ICEDTEA_SRCDIR}/openjdk.tar.xz || die
198   mpatch ${PNAME}-8.3.4.0-gcc6.patch || die   ln -snf ${SOURCEDIR}/${PNAME}/${JDK_SRCFILE} ${ICEDTEA_SRCDIR}/jdk.tar.xz || die
199     ln -snf ${SOURCEDIR}/${PNAME}/${JAXP_SRCFILE} ${ICEDTEA_SRCDIR}/jaxp.tar.xz || die
200   ln -snf ${SOURCEDIR}/${PNAME}/${OPENJDK_SRCFILE} ${ICEDTEA_SRCDIR}/openjdk.tar.bz2 || die   ln -snf ${SOURCEDIR}/${PNAME}/${JAXWS_SRCFILE} ${ICEDTEA_SRCDIR}/jaxws.tar.xz || die
201   ln -snf ${SOURCEDIR}/${PNAME}/${JDK_SRCFILE} ${ICEDTEA_SRCDIR}/jdk.tar.bz2 || die   ln -snf ${SOURCEDIR}/${PNAME}/${CORBA_SRCFILE} ${ICEDTEA_SRCDIR}/corba.tar.xz || die
202   ln -snf ${SOURCEDIR}/${PNAME}/${JAXP_SRCFILE} ${ICEDTEA_SRCDIR}/jaxp.tar.bz2 || die   ln -snf ${SOURCEDIR}/${PNAME}/${HOTSPOT_SRCFILE} ${ICEDTEA_SRCDIR}/hotspot.tar.xz || die
203   ln -snf ${SOURCEDIR}/${PNAME}/${JAXWS_SRCFILE} ${ICEDTEA_SRCDIR}/jaxws.tar.bz2 || die   ln -snf ${SOURCEDIR}/${PNAME}/${LANGTOOLS_SRCFILE} ${ICEDTEA_SRCDIR}/langtools.tar.xz || die
204   ln -snf ${SOURCEDIR}/${PNAME}/${CORBA_SRCFILE} ${ICEDTEA_SRCDIR}/corba.tar.bz2 || die   ln -snf ${SOURCEDIR}/${PNAME}/${NASHORN_SRCFILE} ${ICEDTEA_SRCDIR}/nashorn.tar.xz || die
  ln -snf ${SOURCEDIR}/${PNAME}/${HOTSPOT_SRCFILE} ${ICEDTEA_SRCDIR}/hotspot.tar.bz2 || die  
  ln -snf ${SOURCEDIR}/${PNAME}/${LANGTOOLS_SRCFILE} ${ICEDTEA_SRCDIR}/langtools.tar.bz2 || die  
  ln -snf ${SOURCEDIR}/${PNAME}/${NASHORN_SRCFILE} ${ICEDTEA_SRCDIR}/nashorn.tar.bz2 || die  
205  }  }
206    
207  src_compile()  src_compile()
# Line 204  src_compile() Line 213  src_compile()
213   # get the right java profile   # get the right java profile
214   source /etc/profile   source /etc/profile
215    
216     export MAKEFLAGS="${MAKEOPTS/-j}"
217   export ALT_PARALLEL_COMPILE_JOBS="${MAKEOPTS/-j}"   export ALT_PARALLEL_COMPILE_JOBS="${MAKEOPTS/-j}"
218   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
219   unset MAKEOPTS   unset MAKEOPTS
220    
221     export CFLAGS+=" -Wno-error=deprecated-declarations"
222    
223   if [[ ${BOOTSTRAP} = 1 ]]   if [[ ${BOOTSTRAP} = 1 ]]
224   then   then
225   myopts+=" --enable-bootstrap"   myopts+=" --enable-bootstrap"
# Line 219  src_compile() Line 231  src_compile()
231   myopts+=" --disable-system-sctp"   myopts+=" --disable-system-sctp"
232    
233   mconfigure \   mconfigure \
234     --with-update-version="${JDK_UPDATE}" \
235     --with-build-number="${JDK_BUILD}" \
236   --with-pkgversion="Magellan-Linux ${PVER} ${ARCH}" \   --with-pkgversion="Magellan-Linux ${PVER} ${ARCH}" \
237   --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \   --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
238   --with-jdk-home=${JDK_HOME} \   --with-jdk-home=${JDK_HOME} \
  --with-rhino \  
239   --disable-downloading \   --disable-downloading \
240   --disable-docs \   --disable-docs \
  --disable-zero \  
  --disable-cacao \  
  --disable-jamvm \  
  --disable-shark \  
241   --disable-system-kerberos \   --disable-system-kerberos \
242   --enable-pulse-java \   --enable-unlimited-crypto \
243   --enable-nss \   --with-zlib=system \
  --enable-infinality=no \  
244   ${myopts} \   ${myopts} \
245   || die   || die
246    # --with-rhino \
247    # --disable-zero \
248    # --disable-cacao \
249    # --disable-jamvm \
250    # --disable-shark \
251    # --enable-pulse-java \
252    # --enable-nss \
253    # --enable-infinality=no \
254    
255   mmake patch || die   mmake patch || die
256    
# Line 246  src_compile() Line 262  src_compile()
262   make \   make \
263   DISTRO_NAME="Magellan-Linux" \   DISTRO_NAME="Magellan-Linux" \
264   DISTRO_PACKAGE_VERSION="magellan-${PVER}-${PBUILD}-${ARCH}" \   DISTRO_PACKAGE_VERSION="magellan-${PVER}-${PBUILD}-${ARCH}" \
265     DEBUG_BINARIES=true SCTP_WERROR= \
266   || die   || die
267  }  }
268    

Legend:
Removed from v.29406  
changed lines
  Added in v.29420