From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
Date: Mon, 31 Oct 2022 13:27:26 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40244@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1327 bytes --]
There is a new 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: 5351 bytes --]
From 58d4b5567e2ab75af27b524b2f00cac5ab7cfb1b 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 20:27:19 +0700
Subject: [PATCH 1/4] racket: do not define function conditionally
---
srcpkgs/racket/template | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/racket/template b/srcpkgs/racket/template
index a6f280081cbd..230f6c6e13a4 100644
--- a/srcpkgs/racket/template
+++ b/srcpkgs/racket/template
@@ -21,17 +21,22 @@ nostrip=yes
patch_args="-Np2"
if [ "$CROSS_BUILD" ]; then
- _chezscheme_path="${XBPS_BUILDDIR}/${wrksrc}/${build_wrksrc}"
-
- configure_args+=" --enable-racket=/usr/bin/racket
- --enable-scheme=${_chezscheme_path}"
hostmakedepends+=" racket sqlite-devel"
+fi
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ configure_args+=" --enable-racket=/usr/bin/racket
+ --enable-scheme=${wrksrc}/src"
+ fi
+}
+pre_build() {
# Build ChezScheme for the host so we can use it to build Racket
# Using "--enable-racket=auto" above selects the wrong compiler toolchain
- pre_build() {
+ if [ "$CROSS_BUILD" ]; then
(
- cd ${_chezscheme_path}/ChezScheme
+ cd ChezScheme
# If this builds the wrong arch, Racket's automatic
# arch detection for the ChezScheme build has failed.
@@ -49,8 +54,8 @@ if [ "$CROSS_BUILD" ]; then
./configure --disable-curses --disable-x11
make
)
- }
-fi
+ fi
+}
post_install() {
vlicense LICENSE-libscheme.txt
From 4d0bbe13adbbb9cb4724d42494ab0a8bb88196f5 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 12:07:02 +0700
Subject: [PATCH 2/4] yaboot: fix build after auto-create_wrksrc
---
srcpkgs/yaboot/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/yaboot/template b/srcpkgs/yaboot/template
index 862468944066..c879ed74f1e2 100644
--- a/srcpkgs/yaboot/template
+++ b/srcpkgs/yaboot/template
@@ -3,6 +3,7 @@ pkgname=yaboot
version=1.3.17
revision=1
archs="ppc64 ppc64-musl ppc ppc-musl"
+create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="autoconf automake"
depends="powerpc-utils hfsutils"
@@ -12,7 +13,7 @@ license="GPL-2.0-or-later"
homepage="https://wiki.debian.org/YaBoot"
_e2fsprogs_ver="1.41.14"
distfiles="https://cdimage.debian.org/cdimage/cd-sources/yaboot_${version}.orig.tar.gz
- http://ftp.be.debian.org/pub/linux/kernel/people/tytso/e2fsprogs/e2fsprogs-${_e2fsprogs_ver}.tar.gz"
+ $KERNEL_SITE/kernel/people/tytso/e2fsprogs/e2fsprogs-${_e2fsprogs_ver}.tar.gz"
checksum="2fb738d8fd48b94ab2534a4fdf63738ad02c1a30f4b2add91f837baff8fa2aa1
3f8ac1fedd7c4bec480afcbe4acabdd4ac59ec0446a0fd50c8975cd0aad7b176"
# Don't want stripped yaboot bits to leak into -dbg
@@ -34,12 +35,13 @@ do_check() {
:
}
+post_extract() {
+ mv yaboot-${version}/* .
+}
+
post_patch() {
# Add support for DESTDIR in order to not leak files
sed -i 's/^ROOT =/ROOT = $(DESTDIR)/' Makefile
-
- # Ensure safe cleanup
- mv ${XBPS_BUILDDIR}/e2fsprogs-${_e2fsprogs_ver} .
}
# This builds e2fsprogs libraries, needed by yaboot for ext* support
From d23c953669cfcd6086f4bfd3f2471ddc76267e41 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 12:02:05 +0700
Subject: [PATCH 3/4] kodi: fix cross-build after auto-create_wrksrc
---
srcpkgs/kodi/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 4b6c9e1ade0c..65b515016585 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -94,8 +94,6 @@ if [ -z "$CROSS_BUILD" ]; then
else
hostmakedepends+=" libmariadbclient-devel SDL2_image-devel lzo-devel
libwaylandpp-devel"
- configure_args+=" -DWITH_JSONSCHEMABUILDER:PATH=$XBPS_BUILDDIR/$wrksrc/tools/JsonSchemaBuilder
- -DWITH_TEXTUREPACKER:PATH=$XBPS_BUILDDIR/$wrksrc/tools/TexturePacker"
fi
if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
@@ -121,6 +119,9 @@ pre_configure() {
mv tools/depends/native/$i/native/$i tools/$i
make -C tools/depends/native/$i distclean
done
+ configure_args+="
+ -DWITH_JSONSCHEMABUILDER:PATH=$wrksrc/tools/JsonSchemaBuilder
+ -DWITH_TEXTUREPACKER:PATH=$wrksrc/tools/TexturePacker"
fi
}
From e6e3f24abc20d1e1dc77e19d89c0ae7fcfef337c 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:47 +0700
Subject: [PATCH 4/4] citations: remove unused variable
---
srcpkgs/citations/template | 1 -
1 file changed, 1 deletion(-)
diff --git a/srcpkgs/citations/template b/srcpkgs/citations/template
index feb839767cd5..5dbdc7c9fa62 100644
--- a/srcpkgs/citations/template
+++ b/srcpkgs/citations/template
@@ -14,7 +14,6 @@ license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/World/citations"
distfiles="https://gitlab.gnome.org/World/citations/-/archive/${version}/citations-${version}.tar.gz"
checksum=77ac6a7cc442de74eccfc3f07687803cd1feca2da348753eddd34404b94bf253
-_meson_builddir="${XBPS_BUILDDIR}/citations-${version}/build"
# Allows the cross build to know where the file is placed--build.ninja does not account for cross build
pre_build() {
next reply other threads:[~2022-10-31 12:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-31 12:27 sgn [this message]
2022-10-31 15:00 ` [PR PATCH] [Updated] " sgn
2022-11-01 3:35 ` sgn
2022-11-01 4:38 ` sgn
2022-11-01 5:26 ` sgn
2022-11-01 6:24 ` sgn
2022-11-01 7:34 ` sgn
2022-11-01 8:16 ` sgn
2022-11-01 9:13 ` sgn
2022-11-01 10:27 ` sgn
2022-11-01 11:02 ` sgn
2022-11-01 14:37 ` sgn
2022-11-02 3:01 ` sgn
2022-11-02 4:29 ` sgn
2022-11-02 5:19 ` sgn
2022-11-02 5:19 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40244@inbox.vuxu.org \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).