Magellan Linux

  • Back to homepage
    • /[smage]/trunk/extras/java8-openjdk/java8-openjdk-8.3.4.0-r1.smage2

    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 29426 by niro, Tue Jun 13 12:21:15 2017 UTC revision 29429 by niro, Wed Jun 14 10:23:58 2017 UTC
    # Line 12  HOMEPAGE="http://openjdk.java.net/" Line 12  HOMEPAGE="http://openjdk.java.net/"
    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=0
    15  # use a binary openjdk 0=no, 1=yes (preferred)  # use a binary openjdk 0=no, 1=yes
    16  # default ist 0, we use our own build OpenJDK  # default ist 0, we use our own build OpenJDK
    17  # this sdk will be used as compiler regardless if bootstrap mode is enabled or not  # this sdk will be used as compiler regardless if bootstrap mode is enabled or not
    18  BINARY_OPENJDK=1  BINARY_OPENJDK=1
    # Line 73  fi Line 73  fi
    73  # provided java version  # provided java version
    74  JAVA_PVER="1.8.0-openjdk-${PVER}"  JAVA_PVER="1.8.0-openjdk-${PVER}"
    75    
     # internal build info  
     JDK_UPDATE="131"  
     JDK_BUILD="b11"  
       
    76  # icedtea8  # icedtea8
    77  # http://icedtea.classpath.org/wiki/Main_Page  # http://icedtea.classpath.org/wiki/Main_Page
    78  ICEDTEA_PVER="${PVER/8.}"  ICEDTEA_PVER="${PVER/8.}"
    # Line 117  LANGTOOLS_SRCFILE="${LANGTOOLS_PVER}.tar Line 113  LANGTOOLS_SRCFILE="${LANGTOOLS_PVER}.tar
    113  NASHORN_PVER="nashorn"  NASHORN_PVER="nashorn"
    114  NASHORN_SRCFILE="${NASHORN_PVER}.tar.xz"  NASHORN_SRCFILE="${NASHORN_PVER}.tar.xz"
    115    
    116    # ccache breaks the build unless the used java compiler is not the same origin/version (sun!=openjdk)
    117  msetfeature "!ccache"  msetfeature "!ccache"
    118  sminclude mtools xdg  sminclude mtools xdg
    119    
    # Line 141  SRC_URI=( Line 138  SRC_URI=(
    138   mirror://${PNAME}/${NASHORN_SRCFILE}   mirror://${PNAME}/${NASHORN_SRCFILE}
    139  )  )
    140    
    141  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:\(.*\):8.\1:'"
       
    142    
    143  split_info_java8-jre-openjdk()  split_info_java8-jre-openjdk()
    144  {  {
    # Line 223  src_compile() Line 219  src_compile()
    219    
    220   export ALT_PARALLEL_COMPILE_JOBS="${MAKEOPTS/-j}"   export ALT_PARALLEL_COMPILE_JOBS="${MAKEOPTS/-j}"
    221   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
      export MAKEFLAGS="${ALT_PARALLEL_COMPILE_JOBS}"  
    222   unset MAKEOPTS   unset MAKEOPTS
    223    
    224   # fix some gcc6 issues, which do more rigorous checking of the C/C++ constructs (from LFS)   # fix some gcc6 issues, which do more rigorous checking of the C/C++ constructs (from LFS)
    225   export CFLAGS+=" -Wno-error=deprecated-declarations -std=c++98 -Wno-error -fno-delete-null-pointer-checks -fno-lifetime-dse"   export CFLAGS+=" -Wno-error=deprecated-declarations -fno-delete-null-pointer-checks -fno-lifetime-dse"
    226   export CXXFLAGS=" -std=c++98 -fno-delete-null-pointer-checks -fno-lifetime-dse"   export CXXFLAGS+=" -std=c++98 -fno-delete-null-pointer-checks -fno-lifetime-dse"
    227    
    228   if [[ ${BOOTSTRAP} = 1 ]]   if [[ ${BOOTSTRAP} = 1 ]]
    229   then   then
    # Line 240  src_compile() Line 235  src_compile()
    235   # use in-tree sctp library   # use in-tree sctp library
    236   myopts+=" --disable-system-sctp"   myopts+=" --disable-system-sctp"
    237    
    238   # from LFS:   # disable cccache if requested
    239   # Modern Java installations do not need JAVA_HOME and CLASSPATH is not used here.   if mqueryfeature "!ccache"
    240   # Furthermore, OpenJDK developers recommend to unset JAVA_HOME.   then
    241   unset JAVA_HOME CLASSPATH   myopts+=" --disable-ccache"
    242     fi
    243    
    244   mconfigure \   mconfigure \
      --with-update-version="${JDK_UPDATE}" \  
      --with-build-number="${JDK_BUILD}" \  
    245   --with-pkgversion="Magellan-Linux ${PVER} ${ARCH}" \   --with-pkgversion="Magellan-Linux ${PVER} ${ARCH}" \
    246   --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \   --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
    247   --with-jdk-home=${JDK_HOME} \   --with-jdk-home=${JDK_HOME} \
    # Line 256  src_compile() Line 250  src_compile()
    250   --disable-system-kerberos \   --disable-system-kerberos \
    251   --enable-unlimited-crypto \   --enable-unlimited-crypto \
    252   --with-zlib=system \   --with-zlib=system \
    253     --with-rhino \
    254     --disable-zero \
    255     --disable-cacao \
    256     --disable-jamvm \
    257     --disable-shark \
    258     --enable-pulse-java \
    259     --enable-nss \
    260     --enable-infinality=no \
    261   ${myopts} \   ${myopts} \
    262   || die   || die
     # --with-rhino \  
     # --disable-zero \  
     # --disable-cacao \  
     # --disable-jamvm \  
     # --disable-shark \  
     # --enable-pulse-java \  
     # --enable-nss \  
     # --enable-infinality=no \  
    263    
    264   mmake patch || die   mmake patch || die
    265    
    # Line 277  src_compile() Line 271  src_compile()
    271   make \   make \
    272   DISTRO_NAME="Magellan-Linux" \   DISTRO_NAME="Magellan-Linux" \
    273   DISTRO_PACKAGE_VERSION="magellan-${PVER}-${PBUILD}-${ARCH}" \   DISTRO_PACKAGE_VERSION="magellan-${PVER}-${PBUILD}-${ARCH}" \
      DEBUG_BINARIES=true SCTP_WERROR= \  
    274   || die   || die
    275  }  }
    276    
    # Line 291  src_install_java8-jre-openjdk() Line 284  src_install_java8-jre-openjdk()
    284   source /etc/profile   source /etc/profile
    285    
    286   minstalldir ${JAVA_DIR} || die   minstalldir ${JAVA_DIR} || die
    287   mcopy -R openjdk.build/j2sdk-image/jre ${JAVA_DIR} || die   mcopy -R openjdk.build/images/j2sdk-image/jre ${JAVA_DIR} || die
    288   mchown -R root:root ${JAVA_DIR} || die   mchown -R root:root ${JAVA_DIR} || die
    289    
    290   # only keep configs we need  # # only keep configs we need
    291   rm ${BINDIR}/${JAVA_DIR}/jre/lib/fontconfig.*.bfc || die  # rm ${BINDIR}/${JAVA_DIR}/jre/lib/fontconfig.*.bfc || die
    292   rm ${BINDIR}/${JAVA_DIR}/jre/lib/fontconfig.*.properties.src || die  # rm ${BINDIR}/${JAVA_DIR}/jre/lib/fontconfig.*.properties.src || die
    293   minstallfile openjdk.build/j2sdk-image/jre/lib/fontconfig.Ubuntu.bfc \  # minstallfile openjdk.build/images/j2sdk-image/jre/lib/fontconfig.Ubuntu.bfc \
    294   ${JAVA_DIR}/jre/lib/fontconfig.bfc || die  # ${JAVA_DIR}/jre/lib/fontconfig.bfc || die
    295   minstallfile openjdk.build/j2sdk-image/jre/lib/fontconfig.Ubuntu.properties.src \  # minstallfile openjdk.build/images/j2sdk-image/jre/lib/fontconfig.Ubuntu.properties.src \
    296   ${JAVA_DIR}/jre/lib/fontconfig.properties.src || die  # ${JAVA_DIR}/jre/lib/fontconfig.properties.src || die
    297    
    298   # get the right platform, needed plugin and env.d script install   # get the right platform, needed plugin and env.d script install
    299   local PLATFORM="${ARCH}"   local PLATFORM="${ARCH}"
    # Line 336  src_install_java8-jdk-openjdk() Line 329  src_install_java8-jdk-openjdk()
    329   local JAVA_DIR="/usr/$(mlibdir)/jvm/java-${JAVA_PVER}"   local JAVA_DIR="/usr/$(mlibdir)/jvm/java-${JAVA_PVER}"
    330    
    331   minstalldir /usr/$(mlibdir)/jvm || die   minstalldir /usr/$(mlibdir)/jvm || die
    332   mcopy -R openjdk.build/j2sdk-image ${JAVA_DIR} || die   mcopy -R openjdk.build/images/j2sdk-image ${JAVA_DIR} || die
    333   mchown -R root:root ${JAVA_DIR} || die   mchown -R root:root ${JAVA_DIR} || die
    334    
    335   # save space and symlink some twice installed binaries   # save space and symlink some twice installed binaries
    336   local i   local i
    337   for i in $(find ${ICEDTEA_SRCDIR}/openjdk.build/j2sdk-image/jre/bin -type f -printf '%f\n')   for i in $(find ${ICEDTEA_SRCDIR}/openjdk.build/images/j2sdk-image/jre/bin -type f -printf '%f\n')
    338   do   do
    339   if [[ -x ${BINDIR}/${JAVA_DIR}/bin/${i} ]]   if [[ -x ${BINDIR}/${JAVA_DIR}/bin/${i} ]]
    340   then   then
    # Line 399  src_install_java8-src-openjdk() Line 392  src_install_java8-src-openjdk()
    392   cd ${ICEDTEA_SRCDIR}   cd ${ICEDTEA_SRCDIR}
    393   local JAVA_DIR="/usr/$(mlibdir)/jvm/java-${JAVA_PVER}"   local JAVA_DIR="/usr/$(mlibdir)/jvm/java-${JAVA_PVER}"
    394   minstalldir ${JAVA_DIR} || die   minstalldir ${JAVA_DIR} || die
    395   mcopy -R openjdk.build/j2sdk-image/src.zip ${JAVA_DIR} || die   mcopy -R openjdk.build/images/j2sdk-image/src.zip ${JAVA_DIR} || die
    396   mchown -R root:root ${JAVA_DIR} || die   mchown -R root:root ${JAVA_DIR} || die
    397  }  }
    398    
    # Line 408  src_install_java8-demos-openjdk() Line 401  src_install_java8-demos-openjdk()
    401   cd ${ICEDTEA_SRCDIR}   cd ${ICEDTEA_SRCDIR}
    402   local JAVA_DIR="/usr/$(mlibdir)/jvm/java-${JAVA_PVER}"   local JAVA_DIR="/usr/$(mlibdir)/jvm/java-${JAVA_PVER}"
    403   minstalldir ${JAVA_DIR} || die   minstalldir ${JAVA_DIR} || die
    404   mcopy -R openjdk.build/j2sdk-image/demo ${JAVA_DIR}/ || die   mcopy -R openjdk.build/images/j2sdk-image/demo ${JAVA_DIR}/ || die
    405   mcopy -R openjdk.build/j2sdk-image/sample ${JAVA_DIR}/ || die   mcopy -R openjdk.build/images/j2sdk-image/sample ${JAVA_DIR}/ || die
    406   minstalldir ${JAVA_DIR}/sample/rmi || die   minstalldir ${JAVA_DIR}/sample/rmi || die
    407   minstallexec openjdk.build/j2sdk-image/bin/java-rmi.cgi ${JAVA_DIR}/sample/rmi || die   minstallexec openjdk.build/images/j2sdk-image/bin/java-rmi.cgi ${JAVA_DIR}/sample/rmi || die
    408   mchown -R root:root ${JAVA_DIR} || die   mchown -R root:root ${JAVA_DIR} || die
    409  }  }
    410    
    Legend:
    Removed from v.29426  
    changed lines
      Added in v.29429