From e1064aca7729f623e52b98196fb94e2bce4977e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Thu, 27 Oct 2022 18:59:09 +0700 Subject: [PATCH] openjdk7-bootstrap: use create_wrksrc --- srcpkgs/openjdk7-bootstrap/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template index 694b69e63db..53dc975a16d 100644 --- a/srcpkgs/openjdk7-bootstrap/template +++ b/srcpkgs/openjdk7-bootstrap/template @@ -8,7 +8,7 @@ _final_jdk_home="/usr/lib/jvm/java-1.7-openjdk" version=7u221b02 revision=4 archs="x86_64* i686* aarch64* arm* ppc64*" -wrksrc=icedtea-${_icedtea_ver} +create_wrksrc=yes build_style=gnu-configure configure_args=" --with-parallel-jobs=${XBPS_MAKEJOBS} @@ -88,9 +88,10 @@ nocross=yes CFLAGS="-fcommon" post_extract() { + mv icedtea-*/* . # ensure they're cleaned up - mv ../apache-ant-${_ant_ver} ${wrksrc}/apache-ant - mv ../rhino${_rhino_ver} ${wrksrc}/rhino + mv apache-ant-${_ant_ver} apache-ant + mv rhino${_rhino_ver} rhino # distrib patches are relative to wrksrc for patch in $(cat ${FILESDIR}/dist_patches_${XBPS_TARGET_LIBC}.txt); do