moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

openjdk: get rid of XBPS_GCC_* usage

Browse source
This commit is contained in:
maxice8 2019-01-18 02:59:01 -02:00 • committed by Toyam Cox
parent a3dae00da3
commit 6ba5ba1ba2
1 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
srcpkgs/openjdk/template
View file

@ -15,7 +15,7 @@ version="${_java_ver}u${_jdk_update}b${_jdk_build}"
revision=1 revision=1
_repo_ver="jdk${version/b/-b}" _repo_ver="jdk${version/b/-b}"
nocross=yes nocross=yes
wrksrc=jdk8u-jdk8u${_jdk_update}-b${_jdk_build}/ wrksrc="jdk8u-jdk8u${_jdk_update}-b${_jdk_build}/"
build_style=gnu-configure build_style=gnu-configure
configure_args=" configure_args="
--prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@ -129,18 +129,15 @@ alternatives="
" "
CFLAGS="-Wno-error=deprecated-declarations" CFLAGS="-Wno-error=deprecated-declarations"
if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then
# Append CFLAGS to set work around code which gcc6 would # Append CFLAGS to set work around code which gcc6 would
# otherwise regard as out-of-specification and allow it # otherwise regard as out-of-specification and allow it
# to produce a working program. # to produce a working program.
CFLAGS+=" -Wno-error -std=c++98 -fno-delete-null-pointer-checks -fno-lifetime-dse" CFLAGS+=" -Wno-error -std=c++98 -fno-delete-null-pointer-checks -fno-lifetime-dse"
fi
if [ ${XBPS_GCC_VERSION_MAJOR} -gt 7 ]; then CFLAGS+=" -Wno-deprecated-declarations -Wno-stringop-overflow -Wno-return-type"
CFLAGS+=" -Wno-deprecated-declarations -Wno-stringop-overflow -Wno-return-type"
fi
post_extract() { post_extract() {
if [ ${XBPS_GCC_VERSION_MAJOR} -gt 5 ]; then
cd ${XBPS_BUILDDIR}/jdk-${_repo_ver} cd ${XBPS_BUILDDIR}/jdk-${_repo_ver}
# gcc6 complains about the signed shift left # gcc6 complains about the signed shift left
sed -i src/share/native/com/sun/java/util/jar/pack/constants.h \ sed -i src/share/native/com/sun/java/util/jar/pack/constants.h \
@ -149,7 +146,6 @@ post_extract() {
sed -i src/share/native/com/sun/java/util/jar/pack/jni.cpp \ sed -i src/share/native/com/sun/java/util/jar/pack/jni.cpp \
-e"295s;false;null;" -e"295s;false;null;"
cd ${wrksrc} cd ${wrksrc}
fi
chmod +x configure chmod +x configure
for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do
ln -s ../${subrepo}-${_repo_ver} ${subrepo} ln -s ../${subrepo}-${_repo_ver} ${subrepo}