openjdk15-bootstrap: use create_wrksrc

This commit is contained in:
Đoàn Trần Công Danh 2022-10-27 18:59:09 +07:00
parent 01e3746774
commit b3e7eece20
1 changed files with 6 additions and 9 deletions

View File

@ -7,7 +7,8 @@ _jdk_update="${version#*+}"
_base_version="${version%+*}" _base_version="${version%+*}"
_jdk_home="usr/lib/jvm/openjdk${_java_ver}" _jdk_home="usr/lib/jvm/openjdk${_java_ver}"
archs="x86_64* i686* aarch64* armv7* ppc64*" archs="x86_64* i686* aarch64* armv7* ppc64*"
wrksrc="jdk${_java_ver}u-jdk-${version}" create_wrksrc=yes
build_wrksrc=openjdk
build_style=gnu-configure build_style=gnu-configure
configure_args="--disable-warnings-as-errors configure_args="--disable-warnings-as-errors
--prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib --prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@ -18,7 +19,7 @@ configure_args="--disable-warnings-as-errors
--with-libpng=system --with-libpng=system
--with-lcms=system --with-lcms=system
--with-jtreg=no --with-jtreg=no
--with-gtest=${XBPS_BUILDDIR}/googletest-release-1.8.1 --with-gtest=${XBPS_BUILDDIR}/${pkgname}-${version}/googletest-release-1.8.1
--with-debug-level=release --with-debug-level=release
--with-jobs=${XBPS_ORIG_MAKEJOBS} --with-jobs=${XBPS_ORIG_MAKEJOBS}
--with-version-pre= --with-version-pre=
@ -70,9 +71,10 @@ if [ -n "$XBPS_DEBUG_PKGS" ]; then
fi fi
post_extract() { post_extract() {
chmod +x configure mv jdk* openjdk
chmod +x openjdk/configure
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
rm -r src/jdk.hotspot.agent rm -r openjdk/src/jdk.hotspot.agent
fi fi
} }
@ -118,8 +120,3 @@ post_install() {
vlicense ASSEMBLY_EXCEPTION vlicense ASSEMBLY_EXCEPTION
vlicense LICENSE vlicense LICENSE
} }
do_clean() {
# clean up gtest
rm -rf ${XBPS_BUILDDIR}/googletest-release-*
}