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 29420 by niro, Tue Jun 13 11:12:17 2017 UTC revision 29425 by niro, Tue Jun 13 12:20:55 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=1  BOOTSTRAP=0
15  # use a binary sun jdk 0=no, 1=yes  # use a binary openjdk 0=no, 1=yes (preferred)
16  BOOTSTRAP_BINARY_SUNJDK=1  # default ist 0, we use our own build OpenJDK
17  # use a binary openjdk 0=no, 1=yes  # this sdk will be used as compiler regardless if bootstrap mode is enabled or not
18  BOOTSTRAP_BINARY_OPENJDK=0  BINARY_OPENJDK=1
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 49  SDEPEND="${JRE_DEPEND} Line 49  SDEPEND="${JRE_DEPEND}
49    
50  if [[ ${BOOTSTRAP} = 1 ]]  if [[ ${BOOTSTRAP} = 1 ]]
51  then  then
52   if [[ ${BOOTSTRAP_BINARY_SUNJDK} = 1 ]]   if [[ ${BINARY_OPENJDK} = 1 ]]
53   then   then
54   SDEPEND="${SDEPEND}   SDEPEND="${SDEPEND}
55   >= dev-java/java8-jdk-sun-8"   >= dev-java/java8-jdk-openjdk-bin-8"
  elif [[ ${BOOTSTRAP_BINARY_OPENJDK} = 1 ]]  
  then  
  SDEPEND="${SDEPEND}  
  >= dev-java/java8-jdk-openjdk-binary-8"  
56   else   else
57     # previous java version
58   SDEPEND="${SDEPEND}   SDEPEND="${SDEPEND}
59   >= dev-java/java7-jdk-openjdk-7"   >= dev-java/java7-jdk-openjdk-7"
60   fi   fi
61  else  else
62   SDEPEND="${SDEPEND}   if [[ ${BINARY_OPENJDK} = 1 ]]
63   >= dev-java/java8-jdk-openjdk-${PVER%%.*}"   then
64     SDEPEND="${SDEPEND}
65     >= dev-java/java8-jdk-openjdk-bin-8"
66     else
67     # current java version
68     SDEPEND="${SDEPEND}
69     >= dev-java/java8-jdk-openjdk-${PVER%%.*}"
70     fi
71  fi  fi
72    
73  # provided java version  # provided java version
74  JAVA_PVER="1.8.0-openjdk-${PVER}"  JAVA_PVER="1.8.0-openjdk-${PVER}"
75    
76    # internal build info
77  JDK_UPDATE="131"  JDK_UPDATE="131"
78  JDK_BUILD="b11"  JDK_BUILD="b11"
79    
80  # icedtea7  # icedtea8
81  # http://icedtea.classpath.org/wiki/Main_Page  # http://icedtea.classpath.org/wiki/Main_Page
82  ICEDTEA_PVER="${PVER/8.}"  ICEDTEA_PVER="${PVER/8.}"
83  ICEDTEA_SRCFILE="icedtea-${ICEDTEA_PVER}.tar.gz"  ICEDTEA_SRCFILE="icedtea-${ICEDTEA_PVER}.tar.gz"
# Line 171  pkg_setup() Line 176  pkg_setup()
176    
177   if [[ ${BOOTSTRAP} = 1 ]]   if [[ ${BOOTSTRAP} = 1 ]]
178   then   then
179   if [[ ${BOOTSTRAP_BINARY_SUNJDK} = 1 ]]   if [[ ${BINARY_OPENJDK} = 1 ]]
  then  
  # switch to java8-sun  
  java-update java8-sun  
  elif [[ ${BOOTSTRAP_BINARY_OPENJDK} = 1 ]]  
180   then   then
181   # switch to java8-openjdk-binary   # switch to java8-openjdk-bin
182   java-update java8-openjdk-binary   java-update java8-openjdk-bin
183   else   else
184   # switch to java7-openjdk   # switch to java7-openjdk
185   java-update java7-openjdk   java-update java7-openjdk
186   fi   fi
187   else   else
188   # switch to java8-openjdk   if [[ ${BINARY_OPENJDK} = 1 ]]
189   java-update java8-openjdk   then
190     # switch to java8-openjdk-bin
191     java-update java8-openjdk-bin
192     else
193     # switch to java8-openjdk
194     java-update java8-openjdk
195     fi
196   fi   fi
197  }  }
198    
# Line 213  src_compile() Line 220  src_compile()
220   # get the right java profile   # get the right java profile
221   source /etc/profile   source /etc/profile
222    
  export MAKEFLAGS="${MAKEOPTS/-j}"  
223   export ALT_PARALLEL_COMPILE_JOBS="${MAKEOPTS/-j}"   export ALT_PARALLEL_COMPILE_JOBS="${MAKEOPTS/-j}"
224   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
225     export MAKEFLAGS="${ALT_PARALLEL_COMPILE_JOBS}"
226   unset MAKEOPTS   unset MAKEOPTS
227    
228   export CFLAGS+=" -Wno-error=deprecated-declarations"   # fix some gcc6 issues, which do more rigorous checking of the C/C++ constructs (from LFS)
229     export CFLAGS+=" -Wno-error=deprecated-declarations -std=c++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse"
230     export CXXFLAGS=" -std=c++98 -fno-delete-null-pointer-checks -fno-lifetime-dse"
231    
232   if [[ ${BOOTSTRAP} = 1 ]]   if [[ ${BOOTSTRAP} = 1 ]]
233   then   then
# Line 230  src_compile() Line 239  src_compile()
239   # use in-tree sctp library   # use in-tree sctp library
240   myopts+=" --disable-system-sctp"   myopts+=" --disable-system-sctp"
241    
242     # from LFS:
243     # Modern Java installations do not need JAVA_HOME and CLASSPATH is not used here.
244     # Furthermore, OpenJDK developers recommend to unset JAVA_HOME.
245     unset JAVA_HOME CLASSPATH
246    
247   mconfigure \   mconfigure \
248   --with-update-version="${JDK_UPDATE}" \   --with-update-version="${JDK_UPDATE}" \
249   --with-build-number="${JDK_BUILD}" \   --with-build-number="${JDK_BUILD}" \

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