tb/java-scratchspace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openjdk14-boot: share common options

Browse Source
This commit is contained in:
Tim Biermann 2021-03-14 16:43:43 +01:00
parent f0fa245d6d
commit aa9fa138a2
Signed by: tb
GPG Key ID: 42F8B4E30B673606
1 changed files with 32 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
openjdk14-boot/Pkgfile
View File

@ -13,13 +13,9 @@ source=(https://crux.ster.zone/downloads/java/openjdk-$version.tar.bz2
https://crux.ster.zone/downloads/java/java_cacerts-${_cert_ver}) https://crux.ster.zone/downloads/java/java_cacerts-${_cert_ver})
build() { build() {
# Make sure we do not have ccache masquerade directory in PATH.
# Use --enable-ccache instead of providing a wrapped compiler.
# NOTE: the check for usr/bin/ccache may be too specific, since it rules out
# local or opt installs.
if [ -e '/usr/bin/ccache' ]; then if [ -e '/usr/bin/ccache' ]; then
PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//') PATH=$(echo ${PATH} | awk -v RS=: -v ORS=: '/ccache/ {next} {print}' | sed 's/:*$//')
PKGMK_JDK13+=' --enable-ccache' PKGMK_JDK14+=' --enable-ccache'
fi fi
OLD_PATH=$PATH OLD_PATH=$PATH
@ -30,39 +26,41 @@ build() {
unset CXXFLAGS unset CXXFLAGS
unset LDFLAGS unset LDFLAGS
unset MAKEFLAGS unset MAKEFLAGS
export _CFLAGS+=' -fcommon'
export _CXXFLAGS+=' -fcommon'
[ -z $JOBS ] && JOBS=$(nproc) [ -z $JOBS ] && JOBS=$(nproc)
local _COMMON_OPTIONS="
--disable-hotspot-gtest
--disable-precompiled-headers
--disable-warnings-as-errors
--enable-dtrace=no
--enable-headless-only
--enable-unlimited-crypto
--with-native-debug-symbols=none
--with-debug-level=release
--with-stdc++lib=dynamic
--with-jvm-variants=server
--with-cacerts-file=$SRC/java_cacerts-$_cert_ver
--with-jtreg=no
--with-boot-jdk=$JAVA_HOME
--with-version-opt=CRUX-r$release
--with-version-build=${version#*+}
--with-vendor-name=CRUX
--with-jobs=$JOBS
--with-libjpeg=system
--with-giflib=system
--with-libpng=system
--with-zlib=system
--with-lcms=system"
mkdir $SRC/{build-boot,build} mkdir $SRC/{build-boot,build}
cd $SRC/build-boot cd $SRC/build-boot
export _CFLAGS+=' -fcommon' LC_ALL=C \
export _CXXFLAGS+=' -fcommon' /bin/bash $SRC/jdk14u-jdk-$version/configure $PKGMK_JDK14 \
LC_ALL=C $_COMMON_OPTIONS \
/bin/bash ../jdk14u-jdk-$version/configure $PKGMK_JDK13 \
--prefix=$SRC/build-boot/images/jdk \ --prefix=$SRC/build-boot/images/jdk \
--disable-hotspot-gtest \
--disable-precompiled-headers \
--disable-warnings-as-errors \
--enable-dtrace=no \
--enable-headless-only \
--enable-unlimited-crypto \
--with-native-debug-symbols=none \
--with-debug-level=release \
--with-stdc++lib=dynamic \
--with-jvm-variants=server \
--with-cacerts-file=$SRC/java_cacerts-$_cert_ver \
--with-jtreg=no \
--with-boot-jdk=$JAVA_HOME \
--with-version-opt="CRUX-r$release" \
--with-version-build="${version#*+}" \
--with-vendor-name="CRUX" \
--with-jobs=$JOBS \
--with-libjpeg=system \
--with-giflib=system \
--with-libpng=system \
--with-zlib=system \
--with-lcms=system \
--with-extra-cflags="$_CFLAGS" \ --with-extra-cflags="$_CFLAGS" \
--with-extra-cxxflags="$_CXXFLAGS" --with-extra-cxxflags="$_CXXFLAGS"
@ -75,31 +73,10 @@ build() {
cd $SRC/build cd $SRC/build
LC_ALL=C LC_ALL=C \
/bin/bash ../jdk14u-jdk-$version/configure $PKGMK_JDK13 \ /bin/bash $SRC/jdk14u-jdk-$version/configure $PKGMK_JDK14 \
$_COMMON_OPTIONS \
--prefix=/$name \ --prefix=/$name \
--disable-hotspot-gtest \
--disable-precompiled-headers \
--disable-warnings-as-errors \
--enable-dtrace=no \
--enable-headless-only \
--enable-unlimited-crypto \
--with-native-debug-symbols=none \
--with-debug-level=release \
--with-stdc++lib=dynamic \
--with-jvm-variants=server \
--with-cacerts-file=$SRC/java_cacerts-$_cert_ver \
--with-jtreg=no \
--with-boot-jdk=$JAVA_HOME \
--with-version-opt="CRUX-r$release" \
--with-version-build="${version#*+}" \
--with-vendor-name="CRUX" \
--with-jobs=$JOBS \
--with-libjpeg=system \
--with-giflib=system \
--with-libpng=system \
--with-zlib=system \
--with-lcms=system \
--with-extra-cflags="$_CFLAGS" \ --with-extra-cflags="$_CFLAGS" \
--with-extra-cxxflags="$_CXXFLAGS" --with-extra-cxxflags="$_CXXFLAGS"