Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc

[sgn <sgn@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1332 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages prepare-hooks-extract
https://github.com/void-linux/void-packages/pull/40244

DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (only build to confirm xbps-src still works)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40244.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prepare-hooks-extract-40244.patch --]
[-- Type: text/x-diff, Size: 8535 bytes --]

From 655a29890e356ed73e2b5241dd32ebd8e036b3d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 27 Oct 2022 18:59:03 +0700
Subject: [PATCH 1/7] choosenim: use create_wrksrc

---
 srcpkgs/choosenim/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/choosenim/template b/srcpkgs/choosenim/template
index e2fb62b08d8a..064dbbbdf4d5 100644
--- a/srcpkgs/choosenim/template
+++ b/srcpkgs/choosenim/template
@@ -2,6 +2,7 @@
 pkgname=choosenim
 version=0.7.4
 revision=3
+create_wrksrc=yes
 hostmakedepends="git nim openssl-devel pkg-config"
 makedepends="openssl-devel zlib-devel libarchive-devel"
 depends="gcc"
@@ -19,7 +20,8 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 post_extract() {
-	mv ../nimarchive-0.5.4 nimarchive
+	mv choosenim-$version/* .
+	mv nimarchive-0.5.4 nimarchive
 }
 
 do_build() {

From 409427916bf8d4025bac7d97da8d74ef786f7c54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 27 Oct 2022 18:59:03 +0700
Subject: [PATCH 2/7] deadbeef: use create_wrksrc

---
 srcpkgs/deadbeef/template | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/deadbeef/template b/srcpkgs/deadbeef/template
index 159ad1ce38bc..b664bb1b9bd9 100644
--- a/srcpkgs/deadbeef/template
+++ b/srcpkgs/deadbeef/template
@@ -2,6 +2,7 @@
 pkgname=deadbeef
 version=1.8.8
 revision=1
+create_wrksrc=yes
 build_style=gnu-configure
 configure_args="--disable-oss --disable-lfm --disable-notify --disable-gtk2"
 hostmakedepends="automake libtool gettext gettext-devel intltool pkg-config
@@ -38,10 +39,11 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 fi
 
 post_extract() {
+	mv deadbeef-${version}/* .
 	rm -rf external/apbuild
 	rm -rf external/mp4p
-	mv -v ../apbuild-${_apbuild_commit} external/apbuild
-	mv -v ../mp4p-${_mp4p_commit} external/mp4p
+	mv -v apbuild-${_apbuild_commit} external/apbuild
+	mv -v mp4p-${_mp4p_commit} external/mp4p
 }
 
 pre_configure() {

From f25b90ae6cdada5451f1ec59f0648f57728d6aa7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 27 Oct 2022 18:59:04 +0700
Subject: [PATCH 3/7] dwarffortress: remove libgcc_s.so.1

---
 srcpkgs/dwarffortress/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/dwarffortress/template b/srcpkgs/dwarffortress/template
index 3d89fdd45ec1..47de41be2c1b 100644
--- a/srcpkgs/dwarffortress/template
+++ b/srcpkgs/dwarffortress/template
@@ -1,10 +1,10 @@
 # Template file for 'dwarffortress'
 pkgname=dwarffortress
 version=0.47.05
-revision=1
+revision=2
 _urlver=${version#*.}
 archs="x86_64"
-create_wrksrc=yes
+wrksrc=df_linux
 depends="gtk+ SDL SDL_ttf SDL_image virtual?libGL glu"
 short_desc="Control a dwarven outpost in a randomly generated world"
 maintainer="Robert Stancil <robert.stancil@mavs.uta.edu>"
@@ -18,16 +18,17 @@ nopie="distfiles are precompiled as PIE"
 repository=nonfree
 noshlibprovides=yes
 
-do_patch() {
-	rm df_linux/libs/libstdc++.so.6
+post_extract() {
+	rm libs/libstdc++.so.6
+	rm libs/libgcc_s.so.1
 }
 
 do_install() {
 	vbin ${FILESDIR}/dwarffortress
 	vmkdir /usr/share/dwarffortress
 	vmkdir /usr/lib/dwarffortress/libs
-	vcopy "df_linux/libs/*" /usr/lib/dwarffortress/libs
-	rm -r df_linux/libs
-	vcopy "df_linux/*" /usr/share/dwarffortress/
-	vlicense "df_linux/readme.txt" dwarffortress.txt
+	vcopy "libs/*" /usr/lib/dwarffortress/libs
+	rm -r libs
+	vcopy "*" /usr/share/dwarffortress/
+	vlicense "readme.txt" dwarffortress.txt
 }

From 0374a23013cd6c26b7b11a1490e2224b7329b081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 27 Oct 2022 18:59:07 +0700
Subject: [PATCH 4/7] juCi++: use create_wrksrc

---
 srcpkgs/juCi++/template | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 340b89f624b1..5d294ce1a7d8 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -4,7 +4,7 @@ version=1.6.2
 revision=4
 _libclangmm_commit="b342f4dd6de4fe509a692a4b4fcfc7e24aae9590"
 _tiny_commit="c9c8bf810ddad8cd17882b9a9ee628a690e779f5"
-wrksrc="jucipp-v${version}"
+create_wrksrc=yes
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="aspell-devel clang boost-devel gtksourceviewmm-devel libgit2-devel"
@@ -26,10 +26,10 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 post_extract() {
-	mv ${wrksrc}/../libclangmm-${_libclangmm_commit}/* ${wrksrc}/lib/libclangmm/
-	rm -rf ${wrksrc}/../libclangmm-${_libclangmm_commit}
-	mv ${wrksrc}/../tiny-process-library-${_tiny_commit}/* ${wrksrc}/lib/tiny-process-library
-	rm -rf ${wrksrc}/../tiny-process-library-${_tiny_commit}/*
+	mv jucipp-v$version/* .
+	rmdir lib/libclangmm lib/tiny-process-library
+	mv libclangmm-${_libclangmm_commit} ${wrksrc}/lib/libclangmm
+	mv tiny-process-library-${_tiny_commit} lib/tiny-process-library
 }
 
 post_install() {

From 438e136e3bd655272d315c100e40a3f6b360855e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 27 Oct 2022 18:59:05 +0700
Subject: [PATCH 5/7] gmic: use create_wrksrc

---
 srcpkgs/gmic/template | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template
index f08da26fd824..fce3b7639dfe 100644
--- a/srcpkgs/gmic/template
+++ b/srcpkgs/gmic/template
@@ -3,6 +3,7 @@ pkgname=gmic
 version=2.9.9
 revision=3
 _zart_hash=939cf381c5871e506aabd066037acf2b55143c1d
+create_wrksrc=yes
 build_wrksrc="src"
 build_style=gnu-makefile
 build_helper=qmake
@@ -23,7 +24,8 @@ checksum="9f053338752ec96a6b619718037767682c5fd58e2471c08f3740fdb070605bc0
 # disable_parallel_build="yes"
 
 post_extract() {
-	mv ../zart-${_zart_hash} zart
+	mv gmic-${version}/* .
+	mv zart-${_zart_hash} zart
 }
 
 post_install() {

From 86f9ae4cb2060541eddac57462e4fac2853b877e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 27 Oct 2022 18:59:07 +0700
Subject: [PATCH 6/7] libgccjit: use create_wrksrc

---
 srcpkgs/libgccjit/template | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/libgccjit/template b/srcpkgs/libgccjit/template
index 6f1d6256dcd6..0b37c3ee9f8b 100644
--- a/srcpkgs/libgccjit/template
+++ b/srcpkgs/libgccjit/template
@@ -15,7 +15,7 @@ _gmp_version=6.2.0
 _mpfr_version=4.1.0
 _mpc_version=1.1.0
 _isl_version=0.21
-wrksrc=gcc-${version/pre/_pre}
+create_wrksrc=yes
 short_desc="Just-In-Time Compilation library for GCC"
 maintainer="Lane Biocini <lane@mailbox.org>"
 homepage="https://gcc.gnu.org"
@@ -40,10 +40,11 @@ depends="gcc"
 checkdepends="dejagnu"
 
 post_extract() {
-	mv ${XBPS_BUILDDIR}/gmp-${_gmp_version} ${wrksrc}/gmp
-	mv ${XBPS_BUILDDIR}/mpfr-${_mpfr_version} ${wrksrc}/mpfr
-	mv ${XBPS_BUILDDIR}/mpc-${_mpc_version} ${wrksrc}/mpc
-	mv ${XBPS_BUILDDIR}/isl-${_isl_version} ${wrksrc}/isl
+	mv gcc-*/* .
+	mv gmp-${_gmp_version} gmp
+	mv mpfr-${_mpfr_version} mpfr
+	mv mpc-${_mpc_version} mpc
+	mv isl-${_isl_version} isl
 }
 
 pre_configure() {

From 8aaac9307cd7d6da2931ab7e0f13fbdff37b9f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Tue, 1 Nov 2022 11:38:36 +0700
Subject: [PATCH 7/7] temporary disable check

---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 95f1cd88e338..f39948c6216e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -54,11 +54,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { arch: x86_64, bootstrap: x86_64, test: 1 }
-          - { arch: i686, bootstrap: i686, test: 1 }
+          - { arch: x86_64, bootstrap: x86_64, test: 0 }
+          - { arch: i686, bootstrap: i686, test: 0 }
           - { arch: aarch64, bootstrap: x86_64, test: 0 }
           - { arch: armv7l, bootstrap: x86_64, test: 0 }
-          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 1 }
+          - { arch: x86_64-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: armv6l-musl, bootstrap: x86_64-musl, test: 0 }
           - { arch: aarch64-musl, bootstrap: x86_64-musl, test: 0 }