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: 2354 bytes --]

From b96a8a015dbc517652698ff3b9c4b713cd5ad93f 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: Fri, 28 Oct 2022 11:59:06 +0700
Subject: [PATCH 1/2] icu: fix build after create_wrksrc

---
 srcpkgs/icu/template | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 06d3eb15f19d..3a0b3b2b2f45 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -21,10 +21,6 @@ checksum=67a7e6e51f61faf1306b6935333e13b2c48abd8da6d2f46ce6adca24b1e21ebf
 CFLAGS=-fPIC
 CXXFLAGS=-fPIC
 
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
-fi
-
 # we will be managing icudata manually, because when cross-compiling for
 # another endianness the output data is broken... fortunately, we can use
 # icupkg to convert host-endianness data to target-endianness data
@@ -57,6 +53,7 @@ pre_configure() {
 		mv ${wrksrc}/host-icu/sbin/* ${wrksrc}/host-icu/bin
 		make distclean
 		)
+		configure_args+=" --with-cross-build=${wrksrc}/host-icu"
 	fi
 
 	# libicudata must be linked to libc, otherwise it's soft-float on ARM.

From f09bd96e66819eaf2b07ad3e604dc525e08c7e27 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: Wed, 2 Nov 2022 11:28:35 +0700
Subject: [PATCH 2/2] emacs: use create_wrksrc

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

diff --git a/srcpkgs/emacs/template b/srcpkgs/emacs/template
index 939fbcecc7e0..1e74ec047dac 100644
--- a/srcpkgs/emacs/template
+++ b/srcpkgs/emacs/template
@@ -2,6 +2,7 @@
 pkgname=emacs
 version=28.2
 revision=1
+create_wrksrc=required
 build_style=gnu-configure
 configure_args="--with-file-notification=inotify --with-modules
  $(vopt_with jpeg) $(vopt_with tiff) $(vopt_with gif) $(vopt_with png)
@@ -48,13 +49,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) build_options_default+=" nativecomp";;
 esac
 
-pre_configure() {
+post_extract() {
 	# Just configuring in different directories results in
 	# spurious emacs rebuilds with incompatible build numbers.
-	mkdir -p nox
-	mv * nox || true
-	cp -a nox x11
-	cp -a nox gtk3
+	cp -a emacs-* nox
+	cp -a emacs-* x11
+	cp -a emacs-* gtk3
 }
 
 do_configure() {