* [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
@ 2022-10-31 12:27 sgn
2022-10-31 15:00 ` [PR PATCH] [Updated] " sgn
` (14 more replies)
0 siblings, 15 replies; 16+ messages in thread
From: sgn @ 2022-10-31 12:27 UTC (permalink / raw)
To: ml
[-- 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() {
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
2022-10-31 12:27 [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc sgn
@ 2022-10-31 15:00 ` sgn
2022-11-01 3:35 ` sgn
` (13 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2022-10-31 15:00 UTC (permalink / raw)
To: ml
[-- 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: 12414 bytes --]
From 0d433529954c1a67382b644738d3ce7fd5f47b16 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:34:54 +0700
Subject: [PATCH 1/7] google-earth-pro: proper cleanup
---
srcpkgs/google-earth-pro/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a8dd0d7996be..6bb98082cb63 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -16,6 +16,8 @@ restricted=yes
nostrip=yes
post_fetch() {
+ mkdir -p "$wrksrc"
+ cd "$wrksrc"
$XBPS_FETCH_CMD https://www.google.com/intl/ALL/policies/terms/index.html>Google-Terms-of-Service.html \
https://www.google.com/help/terms_maps.html>Google-Earth-Additional-Terms-of-Service.html \
https://www.google.com/help/legalnotices_maps.html>Legal-Notices-for-Google-Earth-and-Google-Earth-APIs.html \
@@ -42,10 +44,10 @@ do_install() {
usr/share/icons/hicolor/${i}x${i}/apps ${pkgname}.png
done
- for i in ${XBPS_BUILDDIR}/Google-Terms-of-Service.html \
- ${XBPS_BUILDDIR}/Google-Earth-Additional-Terms-of-Service.html \
- ${XBPS_BUILDDIR}/Legal-Notices-for-Google-Earth-and-Google-Earth-APIs.html \
- ${XBPS_BUILDDIR}/Google-Privacy-Policy.html; do
+ for i in Google-Terms-of-Service.html \
+ Google-Earth-Additional-Terms-of-Service.html \
+ Legal-Notices-for-Google-Earth-and-Google-Earth-APIs.html \
+ Google-Privacy-Policy.html; do
vlicense ${i}
done
From 56fb19efd14a94eff6a1b38affc0993f1c31e1c1 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 19:05:42 +0700
Subject: [PATCH 2/7] plume-creator: update to 0.66+dfsg1pl3.2.
---
srcpkgs/plume-creator/patches/qt5.13.patch | 9 -------
srcpkgs/plume-creator/template | 29 ++++++++++------------
2 files changed, 13 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/plume-creator/patches/qt5.13.patch
diff --git a/srcpkgs/plume-creator/patches/qt5.13.patch b/srcpkgs/plume-creator/patches/qt5.13.patch
deleted file mode 100644
index 644a7f52adc7..000000000000
--- a/srcpkgs/plume-creator/patches/qt5.13.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/newProjectWizard/selectpage.cpp 2013-11-06 14:12:32.000000000 +0100
-+++ b/src/newProjectWizard/selectpage.cpp 2013-11-06 14:12:32.000000000 +0100
-@@ -1,5 +1,6 @@
- #include "selectpage.h"
- #include "ui_selectpage.h"
-+#include <QRegExpValidator>
-
- SelectPage::SelectPage(QWidget *parent) :
- QWizardPage(parent),
diff --git a/srcpkgs/plume-creator/template b/srcpkgs/plume-creator/template
index 3c415a06cdd8..c13f83ad811f 100644
--- a/srcpkgs/plume-creator/template
+++ b/srcpkgs/plume-creator/template
@@ -1,9 +1,7 @@
# Template file for 'plume-creator'
pkgname=plume-creator
-version=0.66.1
-revision=3
-_debianversion=0.66+dfsg1
-_debianbuild=3.1build2
+version=0.66+dfsg1pl3.2
+revision=1
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
makedepends="qt5-devel qt5-declarative-devel qt5-tools-devel
@@ -15,22 +13,21 @@ license="GPL-3.0-or-later"
homepage="http://plume-creator.eu/"
configure_args="plume-creator-all.pro"
distfiles="
- ${UBUNTU_SITE}/universe/p/plume-creator/${pkgname}_${_debianversion}.orig.tar.xz
- ${UBUNTU_SITE}/universe/p/plume-creator/${pkgname}_${_debianversion}-${_debianbuild}.debian.tar.bz2"
+ ${DEBIAN_SITE}/main/p/plume-creator/${pkgname}_${version%pl*}.orig.tar.xz
+ ${DEBIAN_SITE}/main/p/plume-creator/${pkgname}_${version/pl/-}.debian.tar.bz2"
checksum="
f88f9524184bcf60dae855d6ad37899aefa39de0edd56098e93ce3b97b679e0c
- 7d473ee7283bc311c7d4dd3311d1e7726df7d45fa0123894265f355b436298e1"
+ e3c5421ca91bf823843bcb6c08be32cec7ddd9b6f069a4ebbe2085fcc5aeea00"
+
+skip_extraction="${pkgname}_${version/pl/-}.debian.tar.bz2"
post_extract() {
- mv -f ${wrksrc}/../debian ${wrksrc}/
- mv -f ${wrksrc}/../resources/themes ${wrksrc}/
- mv -f ${wrksrc}/../src/pics/* ${wrksrc}/src/pics/
- patch -p1 <${wrksrc}/debian/patches/git.2014-01-09.patch
- patch -p1 <${wrksrc}/debian/patches/remove-external.patch
- patch -p1 <${wrksrc}/debian/patches/remove-SlimUpdater.patch
- patch -p1 <${wrksrc}/debian/patches/translations-es.patch
- patch -p1 <${wrksrc}/debian/patches/built-in-Qt5.patch
- patch -p1 <${wrksrc}/debian/patches/desktop.patch
+ local p
+ TAR=$(command -v bsdtar || command -v tar)
+ $TAR -xf $XBPS_SRCDISTDIR/$pkgname-$version/$skip_extraction
+ for p in $(cat debian/patches/series); do
+ patch -Np1 -F0 -i debian/patches/$p
+ done
sed -i 's|quazip/JlCompress|quazip5/JlCompress|g' src/fileupdater.cpp src/hub.h \
src/themes.cpp src/importuserdictdialog.cpp src/zipper/zipper.cpp \
src/common/utils.h
From 12500074d1e123163b06316c3274d4b0edf5ef90 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:19 +0700
Subject: [PATCH 3/7] wasmtime: use create_wrksrc
---
srcpkgs/wasmtime/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wasmtime/template b/srcpkgs/wasmtime/template
index 888af785f36c..836ed5513c81 100644
--- a/srcpkgs/wasmtime/template
+++ b/srcpkgs/wasmtime/template
@@ -2,6 +2,7 @@
pkgname=wasmtime
version=0.25.0
revision=1
+create_wrksrc=yes
archs="x86_64* i686* aarch64*"
build_style=cargo
short_desc="Standalone JIT-style runtime for WebAssembly, using Cranelift"
@@ -33,15 +34,16 @@ do_check() {
:
}
-pre_configure() {
+post_extract() {
+ mv wasmtime-${version}/* .
# move submodules to the proper location
rmdir tests/spec_testsuite
rmdir crates/c-api/wasm-c-api
rmdir crates/wasi-common/WASI
rmdir crates/wasi-crypto/spec
- mv -v ../testsuite-${_spec_testsuite_commit} tests/spec_testsuite
- mv -v ../wasm-c-api-${_wasm_c_api_commit} crates/c-api/wasm-c-api
- mv -v ../WASI-${_WASI_commit} crates/wasi-common/WASI
- mv -v ../wasi-crypto-${_wasi_crypto_commit} crates/wasi-crypto/spec
+ mv -v testsuite-${_spec_testsuite_commit} tests/spec_testsuite
+ mv -v wasm-c-api-${_wasm_c_api_commit} crates/c-api/wasm-c-api
+ mv -v WASI-${_WASI_commit} crates/wasi-common/WASI
+ mv -v wasi-crypto-${_wasi_crypto_commit} crates/wasi-crypto/spec
}
From 66ce9bd6d6daed3b76b1c9b8f06533e3159f094f 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:19 +0700
Subject: [PATCH 4/7] wabt: use create-wrksrc
---
srcpkgs/wabt/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wabt/template b/srcpkgs/wabt/template
index 0a025a820edc..f8cb3d18bb67 100644
--- a/srcpkgs/wabt/template
+++ b/srcpkgs/wabt/template
@@ -2,6 +2,7 @@
pkgname=wabt
version=1.0.23
revision=1
+create_wrksrc=yes
build_style=cmake
make_check_target=check
checkdepends="python3-ply"
@@ -22,12 +23,13 @@ checksum="925f47020705cd2cc00a4ff6a36ab08f8adf6d08c7eac5057db0db38b6b2f16d
aea8cd095e9937f1e14f2c93e026317b197eb2345e7a817fe3932062eb7b792c"
post_extract() {
+ mv wabt-${version}/* .
# move submodule to proper location
rmdir third_party/gtest
rmdir third_party/testsuite
rmdir third_party/wasm-c-api
- mv -v ../googletest-${_gtest_commit} third_party/gtest
- mv -v ../testsuite-${_testsuite_commit} third_party/testsuite
- mv -v ../wasm-c-api-${_wasm_c_api_commit} third_party/wasm-c-api
+ mv -v googletest-${_gtest_commit} third_party/gtest
+ mv -v testsuite-${_testsuite_commit} third_party/testsuite
+ mv -v wasm-c-api-${_wasm_c_api_commit} third_party/wasm-c-api
}
From 61d4e03cba3517826c5f686dce792b09ed6a4d29 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:18 +0700
Subject: [PATCH 5/7] volk: use create_wrksrc
---
srcpkgs/volk/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/volk/template b/srcpkgs/volk/template
index dff042f32d1e..3de82331071b 100644
--- a/srcpkgs/volk/template
+++ b/srcpkgs/volk/template
@@ -3,6 +3,7 @@ pkgname=volk
version=2.5.2
revision=1
_cpu_features_gitrev="188d0d3c383689cdb6bb70dc6da2469faec84f61"
+create_wrksrc=yes
build_style=cmake
hostmakedepends="pkg-config python3-cheetah3 git python3-Mako python3-six"
makedepends="python3-cheetah3 python3-devel python3-Mako python3-six"
@@ -21,8 +22,9 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
+ mv volk-$version/* .
rm -rf cpu_features
- mv ../cpu_features-${_cpu_features_gitrev} cpu_features
+ mv cpu_features-${_cpu_features_gitrev} cpu_features
}
volk-devel_package() {
From 0978b2c8ae2eee011aa4b7191d651fdd2eb645bb 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:18 +0700
Subject: [PATCH 6/7] tracebox: use create-wrksrc
---
srcpkgs/tracebox/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tracebox/template b/srcpkgs/tracebox/template
index 5cf656b50641..ca5713072262 100644
--- a/srcpkgs/tracebox/template
+++ b/srcpkgs/tracebox/template
@@ -5,6 +5,7 @@ revision=5
_click_ver=2.0.1
_crafter_git=3db70ab6fd62ade25de7328aaf8e9ba92696c92e
_crafter_ver=0.3.3git
+create_wrksrc=yes
archs="i686 x86_64"
build_style=gnu-configure
hostmakedepends="automake pkg-config libtool unzip"
@@ -26,11 +27,12 @@ nocross=yes
CXXFLAGS="-DHAVE_LUA_PUSHGLOBALTABLE=1"
pre_configure() {
+ mv tracebox-${version}/* .
# Do what ./bootstrap.sh would have done but without using git to pull submodules
mkdir -p ${wrksrc}/test/tools ${wrksrc}/noinst/libcrafter
- mv -v ../click-${_click_ver} test/tools/click
- mv -v ../libcrafter-${_crafter_git}/{.gitignore,README,libcrafter} noinst/libcrafter
- rmdir -v ../libcrafter-${_crafter_git}
+ mv -v click-${_click_ver} test/tools/click
+ mv -v libcrafter-${_crafter_git}/{.gitignore,README,libcrafter} noinst/libcrafter
+ rmdir -v libcrafter-${_crafter_git}
# Set missing AM_PROG_AR
sed -e "/AC_PROG_CXX/iAM_PROG_AR=${AR}" -i noinst/libcrafter/libcrafter/configure.ac
autoreconf --force --install --verbose
From d0fbea3a3e8f6b3788c33a2db82bd2d49ed002f1 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:17 +0700
Subject: [PATCH 7/7] tigervnc: fix build after auto create-wrksrc
---
srcpkgs/tigervnc/template | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/tigervnc/template b/srcpkgs/tigervnc/template
index 8c1c1d360db3..4add2881ac25 100644
--- a/srcpkgs/tigervnc/template
+++ b/srcpkgs/tigervnc/template
@@ -3,6 +3,7 @@ pkgname=tigervnc
version=1.10.1
revision=3
_xorg_version=1.20.0
+create_wrksrc=yes
build_style=cmake
hostmakedepends="automake gettext xorg-util-macros font-util pkg-config libtool xtrans"
makedepends="fltk-devel zlib-devel libXtst-devel libjpeg-turbo-devel pixman-devel
@@ -13,18 +14,29 @@ short_desc="High performance, multi-platform VNC client and server"
maintainer="Evan Deaubl <evan@deaubl.name>"
license="GPL-2.0-or-later"
homepage="https://www.tigervnc.org"
-distfiles="https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz>tigervnc-${version}.tar.gz
+distfiles="https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz
${XORG_SITE}/xserver/xorg-server-${_xorg_version}.tar.bz2"
checksum="19fcc80d7d35dd58115262e53cac87d8903180261d94c2a6b0c19224f50b58c4
9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6"
conflicts="turbovnc>=0"
+skip_extraction="xorg-server-${_xorg_version}.tar.gz"
-post_configure() {
- cd ${wrksrc}/unix/xserver
- cp -R ${XBPS_BUILDDIR}/xorg-server-${_xorg_version}/* .
- patch -p1 <../xserver120.patch
+post_extract() {
+ mv tigervnc-${version}/* .
+ cp -R xorg-server-${_xorg_version}/* unix/xserver
+}
+
+post_patch() {
+ cd unix/xserver
+ _xorg_version=${_xorg_version%.*}
+ _xorg_version=${_xorg_version/./}
+ patch -p1 <../xserver${_xorg_version}.patch
# glvnd changed versioning
vsed -i configure.ac -e '/LIBGL/s/[79]\..\.0/1.2/'
+}
+
+post_configure() {
+ cd unix/xserver
autoreconf -fi
./configure --host=${XBPS_CROSS_TRIPLET} --prefix=/usr \
--with-pic --without-dtrace --disable-static \
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
2022-10-31 12:27 [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc sgn
2022-10-31 15:00 ` [PR PATCH] [Updated] " sgn
@ 2022-11-01 3:35 ` sgn
2022-11-01 4:38 ` sgn
` (12 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2022-11-01 3:35 UTC (permalink / raw)
To: ml
[-- 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: 12461 bytes --]
From 0d433529954c1a67382b644738d3ce7fd5f47b16 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:34:54 +0700
Subject: [PATCH 1/7] google-earth-pro: proper cleanup
---
srcpkgs/google-earth-pro/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a8dd0d7996be..6bb98082cb63 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -16,6 +16,8 @@ restricted=yes
nostrip=yes
post_fetch() {
+ mkdir -p "$wrksrc"
+ cd "$wrksrc"
$XBPS_FETCH_CMD https://www.google.com/intl/ALL/policies/terms/index.html>Google-Terms-of-Service.html \
https://www.google.com/help/terms_maps.html>Google-Earth-Additional-Terms-of-Service.html \
https://www.google.com/help/legalnotices_maps.html>Legal-Notices-for-Google-Earth-and-Google-Earth-APIs.html \
@@ -42,10 +44,10 @@ do_install() {
usr/share/icons/hicolor/${i}x${i}/apps ${pkgname}.png
done
- for i in ${XBPS_BUILDDIR}/Google-Terms-of-Service.html \
- ${XBPS_BUILDDIR}/Google-Earth-Additional-Terms-of-Service.html \
- ${XBPS_BUILDDIR}/Legal-Notices-for-Google-Earth-and-Google-Earth-APIs.html \
- ${XBPS_BUILDDIR}/Google-Privacy-Policy.html; do
+ for i in Google-Terms-of-Service.html \
+ Google-Earth-Additional-Terms-of-Service.html \
+ Legal-Notices-for-Google-Earth-and-Google-Earth-APIs.html \
+ Google-Privacy-Policy.html; do
vlicense ${i}
done
From 621987ec2f66cd53b26c118d79f7960addbb08b6 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 19:05:42 +0700
Subject: [PATCH 2/7] plume-creator: update to 0.66+dfsg1pl3.2.
---
srcpkgs/plume-creator/patches/qt5.13.patch | 9 -------
srcpkgs/plume-creator/template | 30 ++++++++++------------
2 files changed, 14 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/plume-creator/patches/qt5.13.patch
diff --git a/srcpkgs/plume-creator/patches/qt5.13.patch b/srcpkgs/plume-creator/patches/qt5.13.patch
deleted file mode 100644
index 644a7f52adc7..000000000000
--- a/srcpkgs/plume-creator/patches/qt5.13.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/newProjectWizard/selectpage.cpp 2013-11-06 14:12:32.000000000 +0100
-+++ b/src/newProjectWizard/selectpage.cpp 2013-11-06 14:12:32.000000000 +0100
-@@ -1,5 +1,6 @@
- #include "selectpage.h"
- #include "ui_selectpage.h"
-+#include <QRegExpValidator>
-
- SelectPage::SelectPage(QWidget *parent) :
- QWizardPage(parent),
diff --git a/srcpkgs/plume-creator/template b/srcpkgs/plume-creator/template
index 3c415a06cdd8..8368fd0480d3 100644
--- a/srcpkgs/plume-creator/template
+++ b/srcpkgs/plume-creator/template
@@ -1,9 +1,8 @@
# Template file for 'plume-creator'
pkgname=plume-creator
-version=0.66.1
-revision=3
-_debianversion=0.66+dfsg1
-_debianbuild=3.1build2
+version=0.66+dfsg1pl3.2
+revision=1
+wrksrc="$pkgname-${version%+*}.1"
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
makedepends="qt5-devel qt5-declarative-devel qt5-tools-devel
@@ -15,22 +14,21 @@ license="GPL-3.0-or-later"
homepage="http://plume-creator.eu/"
configure_args="plume-creator-all.pro"
distfiles="
- ${UBUNTU_SITE}/universe/p/plume-creator/${pkgname}_${_debianversion}.orig.tar.xz
- ${UBUNTU_SITE}/universe/p/plume-creator/${pkgname}_${_debianversion}-${_debianbuild}.debian.tar.bz2"
+ ${DEBIAN_SITE}/main/p/plume-creator/${pkgname}_${version%pl*}.orig.tar.xz
+ ${DEBIAN_SITE}/main/p/plume-creator/${pkgname}_${version/pl/-}.debian.tar.bz2"
checksum="
f88f9524184bcf60dae855d6ad37899aefa39de0edd56098e93ce3b97b679e0c
- 7d473ee7283bc311c7d4dd3311d1e7726df7d45fa0123894265f355b436298e1"
+ e3c5421ca91bf823843bcb6c08be32cec7ddd9b6f069a4ebbe2085fcc5aeea00"
+
+skip_extraction="${pkgname}_${version/pl/-}.debian.tar.bz2"
post_extract() {
- mv -f ${wrksrc}/../debian ${wrksrc}/
- mv -f ${wrksrc}/../resources/themes ${wrksrc}/
- mv -f ${wrksrc}/../src/pics/* ${wrksrc}/src/pics/
- patch -p1 <${wrksrc}/debian/patches/git.2014-01-09.patch
- patch -p1 <${wrksrc}/debian/patches/remove-external.patch
- patch -p1 <${wrksrc}/debian/patches/remove-SlimUpdater.patch
- patch -p1 <${wrksrc}/debian/patches/translations-es.patch
- patch -p1 <${wrksrc}/debian/patches/built-in-Qt5.patch
- patch -p1 <${wrksrc}/debian/patches/desktop.patch
+ local p
+ TAR=$(command -v bsdtar || command -v tar)
+ $TAR -xf $XBPS_SRCDISTDIR/$pkgname-$version/$skip_extraction
+ for p in $(cat debian/patches/series); do
+ patch -Np1 -F0 -i debian/patches/$p || return 1
+ done
sed -i 's|quazip/JlCompress|quazip5/JlCompress|g' src/fileupdater.cpp src/hub.h \
src/themes.cpp src/importuserdictdialog.cpp src/zipper/zipper.cpp \
src/common/utils.h
From 545fe24dd5b480d4d55ce7a0f670ce395a557c12 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:19 +0700
Subject: [PATCH 3/7] wasmtime: use create_wrksrc
---
srcpkgs/wasmtime/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wasmtime/template b/srcpkgs/wasmtime/template
index 888af785f36c..836ed5513c81 100644
--- a/srcpkgs/wasmtime/template
+++ b/srcpkgs/wasmtime/template
@@ -2,6 +2,7 @@
pkgname=wasmtime
version=0.25.0
revision=1
+create_wrksrc=yes
archs="x86_64* i686* aarch64*"
build_style=cargo
short_desc="Standalone JIT-style runtime for WebAssembly, using Cranelift"
@@ -33,15 +34,16 @@ do_check() {
:
}
-pre_configure() {
+post_extract() {
+ mv wasmtime-${version}/* .
# move submodules to the proper location
rmdir tests/spec_testsuite
rmdir crates/c-api/wasm-c-api
rmdir crates/wasi-common/WASI
rmdir crates/wasi-crypto/spec
- mv -v ../testsuite-${_spec_testsuite_commit} tests/spec_testsuite
- mv -v ../wasm-c-api-${_wasm_c_api_commit} crates/c-api/wasm-c-api
- mv -v ../WASI-${_WASI_commit} crates/wasi-common/WASI
- mv -v ../wasi-crypto-${_wasi_crypto_commit} crates/wasi-crypto/spec
+ mv -v testsuite-${_spec_testsuite_commit} tests/spec_testsuite
+ mv -v wasm-c-api-${_wasm_c_api_commit} crates/c-api/wasm-c-api
+ mv -v WASI-${_WASI_commit} crates/wasi-common/WASI
+ mv -v wasi-crypto-${_wasi_crypto_commit} crates/wasi-crypto/spec
}
From ddf96d1e521fcfbcf7692210bbd1c6ffa2485095 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:19 +0700
Subject: [PATCH 4/7] wabt: use create-wrksrc
---
srcpkgs/wabt/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wabt/template b/srcpkgs/wabt/template
index 0a025a820edc..f8cb3d18bb67 100644
--- a/srcpkgs/wabt/template
+++ b/srcpkgs/wabt/template
@@ -2,6 +2,7 @@
pkgname=wabt
version=1.0.23
revision=1
+create_wrksrc=yes
build_style=cmake
make_check_target=check
checkdepends="python3-ply"
@@ -22,12 +23,13 @@ checksum="925f47020705cd2cc00a4ff6a36ab08f8adf6d08c7eac5057db0db38b6b2f16d
aea8cd095e9937f1e14f2c93e026317b197eb2345e7a817fe3932062eb7b792c"
post_extract() {
+ mv wabt-${version}/* .
# move submodule to proper location
rmdir third_party/gtest
rmdir third_party/testsuite
rmdir third_party/wasm-c-api
- mv -v ../googletest-${_gtest_commit} third_party/gtest
- mv -v ../testsuite-${_testsuite_commit} third_party/testsuite
- mv -v ../wasm-c-api-${_wasm_c_api_commit} third_party/wasm-c-api
+ mv -v googletest-${_gtest_commit} third_party/gtest
+ mv -v testsuite-${_testsuite_commit} third_party/testsuite
+ mv -v wasm-c-api-${_wasm_c_api_commit} third_party/wasm-c-api
}
From bf95df052cbe84ec19ec58722ad0b37dc01c580f 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:18 +0700
Subject: [PATCH 5/7] volk: use create_wrksrc
---
srcpkgs/volk/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/volk/template b/srcpkgs/volk/template
index dff042f32d1e..3de82331071b 100644
--- a/srcpkgs/volk/template
+++ b/srcpkgs/volk/template
@@ -3,6 +3,7 @@ pkgname=volk
version=2.5.2
revision=1
_cpu_features_gitrev="188d0d3c383689cdb6bb70dc6da2469faec84f61"
+create_wrksrc=yes
build_style=cmake
hostmakedepends="pkg-config python3-cheetah3 git python3-Mako python3-six"
makedepends="python3-cheetah3 python3-devel python3-Mako python3-six"
@@ -21,8 +22,9 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
+ mv volk-$version/* .
rm -rf cpu_features
- mv ../cpu_features-${_cpu_features_gitrev} cpu_features
+ mv cpu_features-${_cpu_features_gitrev} cpu_features
}
volk-devel_package() {
From 4f58eb17f6ebcbc8b4df47dffefa960eaf9fec6a 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:18 +0700
Subject: [PATCH 6/7] tracebox: use create-wrksrc
---
srcpkgs/tracebox/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tracebox/template b/srcpkgs/tracebox/template
index 5cf656b50641..ca5713072262 100644
--- a/srcpkgs/tracebox/template
+++ b/srcpkgs/tracebox/template
@@ -5,6 +5,7 @@ revision=5
_click_ver=2.0.1
_crafter_git=3db70ab6fd62ade25de7328aaf8e9ba92696c92e
_crafter_ver=0.3.3git
+create_wrksrc=yes
archs="i686 x86_64"
build_style=gnu-configure
hostmakedepends="automake pkg-config libtool unzip"
@@ -26,11 +27,12 @@ nocross=yes
CXXFLAGS="-DHAVE_LUA_PUSHGLOBALTABLE=1"
pre_configure() {
+ mv tracebox-${version}/* .
# Do what ./bootstrap.sh would have done but without using git to pull submodules
mkdir -p ${wrksrc}/test/tools ${wrksrc}/noinst/libcrafter
- mv -v ../click-${_click_ver} test/tools/click
- mv -v ../libcrafter-${_crafter_git}/{.gitignore,README,libcrafter} noinst/libcrafter
- rmdir -v ../libcrafter-${_crafter_git}
+ mv -v click-${_click_ver} test/tools/click
+ mv -v libcrafter-${_crafter_git}/{.gitignore,README,libcrafter} noinst/libcrafter
+ rmdir -v libcrafter-${_crafter_git}
# Set missing AM_PROG_AR
sed -e "/AC_PROG_CXX/iAM_PROG_AR=${AR}" -i noinst/libcrafter/libcrafter/configure.ac
autoreconf --force --install --verbose
From e62ef1291fc9f6e7d1707ca3e96235be65808725 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:17 +0700
Subject: [PATCH 7/7] tigervnc: fix build after auto create-wrksrc
---
srcpkgs/tigervnc/template | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/tigervnc/template b/srcpkgs/tigervnc/template
index 8c1c1d360db3..4add2881ac25 100644
--- a/srcpkgs/tigervnc/template
+++ b/srcpkgs/tigervnc/template
@@ -3,6 +3,7 @@ pkgname=tigervnc
version=1.10.1
revision=3
_xorg_version=1.20.0
+create_wrksrc=yes
build_style=cmake
hostmakedepends="automake gettext xorg-util-macros font-util pkg-config libtool xtrans"
makedepends="fltk-devel zlib-devel libXtst-devel libjpeg-turbo-devel pixman-devel
@@ -13,18 +14,29 @@ short_desc="High performance, multi-platform VNC client and server"
maintainer="Evan Deaubl <evan@deaubl.name>"
license="GPL-2.0-or-later"
homepage="https://www.tigervnc.org"
-distfiles="https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz>tigervnc-${version}.tar.gz
+distfiles="https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz
${XORG_SITE}/xserver/xorg-server-${_xorg_version}.tar.bz2"
checksum="19fcc80d7d35dd58115262e53cac87d8903180261d94c2a6b0c19224f50b58c4
9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6"
conflicts="turbovnc>=0"
+skip_extraction="xorg-server-${_xorg_version}.tar.gz"
-post_configure() {
- cd ${wrksrc}/unix/xserver
- cp -R ${XBPS_BUILDDIR}/xorg-server-${_xorg_version}/* .
- patch -p1 <../xserver120.patch
+post_extract() {
+ mv tigervnc-${version}/* .
+ cp -R xorg-server-${_xorg_version}/* unix/xserver
+}
+
+post_patch() {
+ cd unix/xserver
+ _xorg_version=${_xorg_version%.*}
+ _xorg_version=${_xorg_version/./}
+ patch -p1 <../xserver${_xorg_version}.patch
# glvnd changed versioning
vsed -i configure.ac -e '/LIBGL/s/[79]\..\.0/1.2/'
+}
+
+post_configure() {
+ cd unix/xserver
autoreconf -fi
./configure --host=${XBPS_CROSS_TRIPLET} --prefix=/usr \
--with-pic --without-dtrace --disable-static \
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
2022-10-31 12:27 [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc sgn
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
` (11 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2022-11-01 4:38 UTC (permalink / raw)
To: ml
[-- 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: 13683 bytes --]
From 0d433529954c1a67382b644738d3ce7fd5f47b16 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:34:54 +0700
Subject: [PATCH 1/8] google-earth-pro: proper cleanup
---
srcpkgs/google-earth-pro/template | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/google-earth-pro/template b/srcpkgs/google-earth-pro/template
index a8dd0d7996be..6bb98082cb63 100644
--- a/srcpkgs/google-earth-pro/template
+++ b/srcpkgs/google-earth-pro/template
@@ -16,6 +16,8 @@ restricted=yes
nostrip=yes
post_fetch() {
+ mkdir -p "$wrksrc"
+ cd "$wrksrc"
$XBPS_FETCH_CMD https://www.google.com/intl/ALL/policies/terms/index.html>Google-Terms-of-Service.html \
https://www.google.com/help/terms_maps.html>Google-Earth-Additional-Terms-of-Service.html \
https://www.google.com/help/legalnotices_maps.html>Legal-Notices-for-Google-Earth-and-Google-Earth-APIs.html \
@@ -42,10 +44,10 @@ do_install() {
usr/share/icons/hicolor/${i}x${i}/apps ${pkgname}.png
done
- for i in ${XBPS_BUILDDIR}/Google-Terms-of-Service.html \
- ${XBPS_BUILDDIR}/Google-Earth-Additional-Terms-of-Service.html \
- ${XBPS_BUILDDIR}/Legal-Notices-for-Google-Earth-and-Google-Earth-APIs.html \
- ${XBPS_BUILDDIR}/Google-Privacy-Policy.html; do
+ for i in Google-Terms-of-Service.html \
+ Google-Earth-Additional-Terms-of-Service.html \
+ Legal-Notices-for-Google-Earth-and-Google-Earth-APIs.html \
+ Google-Privacy-Policy.html; do
vlicense ${i}
done
From 621987ec2f66cd53b26c118d79f7960addbb08b6 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 19:05:42 +0700
Subject: [PATCH 2/8] plume-creator: update to 0.66+dfsg1pl3.2.
---
srcpkgs/plume-creator/patches/qt5.13.patch | 9 -------
srcpkgs/plume-creator/template | 30 ++++++++++------------
2 files changed, 14 insertions(+), 25 deletions(-)
delete mode 100644 srcpkgs/plume-creator/patches/qt5.13.patch
diff --git a/srcpkgs/plume-creator/patches/qt5.13.patch b/srcpkgs/plume-creator/patches/qt5.13.patch
deleted file mode 100644
index 644a7f52adc7..000000000000
--- a/srcpkgs/plume-creator/patches/qt5.13.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/newProjectWizard/selectpage.cpp 2013-11-06 14:12:32.000000000 +0100
-+++ b/src/newProjectWizard/selectpage.cpp 2013-11-06 14:12:32.000000000 +0100
-@@ -1,5 +1,6 @@
- #include "selectpage.h"
- #include "ui_selectpage.h"
-+#include <QRegExpValidator>
-
- SelectPage::SelectPage(QWidget *parent) :
- QWizardPage(parent),
diff --git a/srcpkgs/plume-creator/template b/srcpkgs/plume-creator/template
index 3c415a06cdd8..8368fd0480d3 100644
--- a/srcpkgs/plume-creator/template
+++ b/srcpkgs/plume-creator/template
@@ -1,9 +1,8 @@
# Template file for 'plume-creator'
pkgname=plume-creator
-version=0.66.1
-revision=3
-_debianversion=0.66+dfsg1
-_debianbuild=3.1build2
+version=0.66+dfsg1pl3.2
+revision=1
+wrksrc="$pkgname-${version%+*}.1"
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools pkg-config"
makedepends="qt5-devel qt5-declarative-devel qt5-tools-devel
@@ -15,22 +14,21 @@ license="GPL-3.0-or-later"
homepage="http://plume-creator.eu/"
configure_args="plume-creator-all.pro"
distfiles="
- ${UBUNTU_SITE}/universe/p/plume-creator/${pkgname}_${_debianversion}.orig.tar.xz
- ${UBUNTU_SITE}/universe/p/plume-creator/${pkgname}_${_debianversion}-${_debianbuild}.debian.tar.bz2"
+ ${DEBIAN_SITE}/main/p/plume-creator/${pkgname}_${version%pl*}.orig.tar.xz
+ ${DEBIAN_SITE}/main/p/plume-creator/${pkgname}_${version/pl/-}.debian.tar.bz2"
checksum="
f88f9524184bcf60dae855d6ad37899aefa39de0edd56098e93ce3b97b679e0c
- 7d473ee7283bc311c7d4dd3311d1e7726df7d45fa0123894265f355b436298e1"
+ e3c5421ca91bf823843bcb6c08be32cec7ddd9b6f069a4ebbe2085fcc5aeea00"
+
+skip_extraction="${pkgname}_${version/pl/-}.debian.tar.bz2"
post_extract() {
- mv -f ${wrksrc}/../debian ${wrksrc}/
- mv -f ${wrksrc}/../resources/themes ${wrksrc}/
- mv -f ${wrksrc}/../src/pics/* ${wrksrc}/src/pics/
- patch -p1 <${wrksrc}/debian/patches/git.2014-01-09.patch
- patch -p1 <${wrksrc}/debian/patches/remove-external.patch
- patch -p1 <${wrksrc}/debian/patches/remove-SlimUpdater.patch
- patch -p1 <${wrksrc}/debian/patches/translations-es.patch
- patch -p1 <${wrksrc}/debian/patches/built-in-Qt5.patch
- patch -p1 <${wrksrc}/debian/patches/desktop.patch
+ local p
+ TAR=$(command -v bsdtar || command -v tar)
+ $TAR -xf $XBPS_SRCDISTDIR/$pkgname-$version/$skip_extraction
+ for p in $(cat debian/patches/series); do
+ patch -Np1 -F0 -i debian/patches/$p || return 1
+ done
sed -i 's|quazip/JlCompress|quazip5/JlCompress|g' src/fileupdater.cpp src/hub.h \
src/themes.cpp src/importuserdictdialog.cpp src/zipper/zipper.cpp \
src/common/utils.h
From 545fe24dd5b480d4d55ce7a0f670ce395a557c12 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:19 +0700
Subject: [PATCH 3/8] wasmtime: use create_wrksrc
---
srcpkgs/wasmtime/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/wasmtime/template b/srcpkgs/wasmtime/template
index 888af785f36c..836ed5513c81 100644
--- a/srcpkgs/wasmtime/template
+++ b/srcpkgs/wasmtime/template
@@ -2,6 +2,7 @@
pkgname=wasmtime
version=0.25.0
revision=1
+create_wrksrc=yes
archs="x86_64* i686* aarch64*"
build_style=cargo
short_desc="Standalone JIT-style runtime for WebAssembly, using Cranelift"
@@ -33,15 +34,16 @@ do_check() {
:
}
-pre_configure() {
+post_extract() {
+ mv wasmtime-${version}/* .
# move submodules to the proper location
rmdir tests/spec_testsuite
rmdir crates/c-api/wasm-c-api
rmdir crates/wasi-common/WASI
rmdir crates/wasi-crypto/spec
- mv -v ../testsuite-${_spec_testsuite_commit} tests/spec_testsuite
- mv -v ../wasm-c-api-${_wasm_c_api_commit} crates/c-api/wasm-c-api
- mv -v ../WASI-${_WASI_commit} crates/wasi-common/WASI
- mv -v ../wasi-crypto-${_wasi_crypto_commit} crates/wasi-crypto/spec
+ mv -v testsuite-${_spec_testsuite_commit} tests/spec_testsuite
+ mv -v wasm-c-api-${_wasm_c_api_commit} crates/c-api/wasm-c-api
+ mv -v WASI-${_WASI_commit} crates/wasi-common/WASI
+ mv -v wasi-crypto-${_wasi_crypto_commit} crates/wasi-crypto/spec
}
From ddf96d1e521fcfbcf7692210bbd1c6ffa2485095 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:19 +0700
Subject: [PATCH 4/8] wabt: use create-wrksrc
---
srcpkgs/wabt/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/wabt/template b/srcpkgs/wabt/template
index 0a025a820edc..f8cb3d18bb67 100644
--- a/srcpkgs/wabt/template
+++ b/srcpkgs/wabt/template
@@ -2,6 +2,7 @@
pkgname=wabt
version=1.0.23
revision=1
+create_wrksrc=yes
build_style=cmake
make_check_target=check
checkdepends="python3-ply"
@@ -22,12 +23,13 @@ checksum="925f47020705cd2cc00a4ff6a36ab08f8adf6d08c7eac5057db0db38b6b2f16d
aea8cd095e9937f1e14f2c93e026317b197eb2345e7a817fe3932062eb7b792c"
post_extract() {
+ mv wabt-${version}/* .
# move submodule to proper location
rmdir third_party/gtest
rmdir third_party/testsuite
rmdir third_party/wasm-c-api
- mv -v ../googletest-${_gtest_commit} third_party/gtest
- mv -v ../testsuite-${_testsuite_commit} third_party/testsuite
- mv -v ../wasm-c-api-${_wasm_c_api_commit} third_party/wasm-c-api
+ mv -v googletest-${_gtest_commit} third_party/gtest
+ mv -v testsuite-${_testsuite_commit} third_party/testsuite
+ mv -v wasm-c-api-${_wasm_c_api_commit} third_party/wasm-c-api
}
From bf95df052cbe84ec19ec58722ad0b37dc01c580f 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:18 +0700
Subject: [PATCH 5/8] volk: use create_wrksrc
---
srcpkgs/volk/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/volk/template b/srcpkgs/volk/template
index dff042f32d1e..3de82331071b 100644
--- a/srcpkgs/volk/template
+++ b/srcpkgs/volk/template
@@ -3,6 +3,7 @@ pkgname=volk
version=2.5.2
revision=1
_cpu_features_gitrev="188d0d3c383689cdb6bb70dc6da2469faec84f61"
+create_wrksrc=yes
build_style=cmake
hostmakedepends="pkg-config python3-cheetah3 git python3-Mako python3-six"
makedepends="python3-cheetah3 python3-devel python3-Mako python3-six"
@@ -21,8 +22,9 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
+ mv volk-$version/* .
rm -rf cpu_features
- mv ../cpu_features-${_cpu_features_gitrev} cpu_features
+ mv cpu_features-${_cpu_features_gitrev} cpu_features
}
volk-devel_package() {
From 4f58eb17f6ebcbc8b4df47dffefa960eaf9fec6a 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:18 +0700
Subject: [PATCH 6/8] tracebox: use create-wrksrc
---
srcpkgs/tracebox/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tracebox/template b/srcpkgs/tracebox/template
index 5cf656b50641..ca5713072262 100644
--- a/srcpkgs/tracebox/template
+++ b/srcpkgs/tracebox/template
@@ -5,6 +5,7 @@ revision=5
_click_ver=2.0.1
_crafter_git=3db70ab6fd62ade25de7328aaf8e9ba92696c92e
_crafter_ver=0.3.3git
+create_wrksrc=yes
archs="i686 x86_64"
build_style=gnu-configure
hostmakedepends="automake pkg-config libtool unzip"
@@ -26,11 +27,12 @@ nocross=yes
CXXFLAGS="-DHAVE_LUA_PUSHGLOBALTABLE=1"
pre_configure() {
+ mv tracebox-${version}/* .
# Do what ./bootstrap.sh would have done but without using git to pull submodules
mkdir -p ${wrksrc}/test/tools ${wrksrc}/noinst/libcrafter
- mv -v ../click-${_click_ver} test/tools/click
- mv -v ../libcrafter-${_crafter_git}/{.gitignore,README,libcrafter} noinst/libcrafter
- rmdir -v ../libcrafter-${_crafter_git}
+ mv -v click-${_click_ver} test/tools/click
+ mv -v libcrafter-${_crafter_git}/{.gitignore,README,libcrafter} noinst/libcrafter
+ rmdir -v libcrafter-${_crafter_git}
# Set missing AM_PROG_AR
sed -e "/AC_PROG_CXX/iAM_PROG_AR=${AR}" -i noinst/libcrafter/libcrafter/configure.ac
autoreconf --force --install --verbose
From e62ef1291fc9f6e7d1707ca3e96235be65808725 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:17 +0700
Subject: [PATCH 7/8] tigervnc: fix build after auto create-wrksrc
---
srcpkgs/tigervnc/template | 22 +++++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/tigervnc/template b/srcpkgs/tigervnc/template
index 8c1c1d360db3..4add2881ac25 100644
--- a/srcpkgs/tigervnc/template
+++ b/srcpkgs/tigervnc/template
@@ -3,6 +3,7 @@ pkgname=tigervnc
version=1.10.1
revision=3
_xorg_version=1.20.0
+create_wrksrc=yes
build_style=cmake
hostmakedepends="automake gettext xorg-util-macros font-util pkg-config libtool xtrans"
makedepends="fltk-devel zlib-devel libXtst-devel libjpeg-turbo-devel pixman-devel
@@ -13,18 +14,29 @@ short_desc="High performance, multi-platform VNC client and server"
maintainer="Evan Deaubl <evan@deaubl.name>"
license="GPL-2.0-or-later"
homepage="https://www.tigervnc.org"
-distfiles="https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz>tigervnc-${version}.tar.gz
+distfiles="https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz
${XORG_SITE}/xserver/xorg-server-${_xorg_version}.tar.bz2"
checksum="19fcc80d7d35dd58115262e53cac87d8903180261d94c2a6b0c19224f50b58c4
9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6"
conflicts="turbovnc>=0"
+skip_extraction="xorg-server-${_xorg_version}.tar.gz"
-post_configure() {
- cd ${wrksrc}/unix/xserver
- cp -R ${XBPS_BUILDDIR}/xorg-server-${_xorg_version}/* .
- patch -p1 <../xserver120.patch
+post_extract() {
+ mv tigervnc-${version}/* .
+ cp -R xorg-server-${_xorg_version}/* unix/xserver
+}
+
+post_patch() {
+ cd unix/xserver
+ _xorg_version=${_xorg_version%.*}
+ _xorg_version=${_xorg_version/./}
+ patch -p1 <../xserver${_xorg_version}.patch
# glvnd changed versioning
vsed -i configure.ac -e '/LIBGL/s/[79]\..\.0/1.2/'
+}
+
+post_configure() {
+ cd unix/xserver
autoreconf -fi
./configure --host=${XBPS_CROSS_TRIPLET} --prefix=/usr \
--with-pic --without-dtrace --disable-static \
From 2ff05a763f8606fb4dea3fbd32fbc618835e002d 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 8/8] 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 }
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
2022-10-31 12:27 [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc sgn
` (2 preceding siblings ...)
2022-11-01 4:38 ` sgn
@ 2022-11-01 5:26 ` sgn
2022-11-01 6:24 ` sgn
` (10 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2022-11-01 5:26 UTC (permalink / raw)
To: ml
[-- 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 }
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
2022-10-31 12:27 [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc sgn
` (3 preceding siblings ...)
2022-11-01 5:26 ` sgn
@ 2022-11-01 6:24 ` sgn
2022-11-01 7:34 ` sgn
` (9 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2022-11-01 6:24 UTC (permalink / raw)
To: ml
[-- 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: 11105 bytes --]
From 691409d76aa9f2549232d073f5fdc3c5a811b805 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:06 +0700
Subject: [PATCH 1/9] grafx2: use create_wrksrc
---
srcpkgs/grafx2/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/grafx2/template b/srcpkgs/grafx2/template
index 724f8fa65765..d9ae5509e634 100644
--- a/srcpkgs/grafx2/template
+++ b/srcpkgs/grafx2/template
@@ -3,7 +3,7 @@ pkgname=grafx2
version=2.6
revision=2
_recoil_version=4.3.1
-wrksrc="grafX2-v${version}"
+create_wrksrc=yes
build_wrksrc="src"
build_style=gnu-makefile
make_build_args="API=sdl2"
@@ -21,7 +21,8 @@ checksum="1d679216e481b0c22d1d160eb1f66ed6ef2c1ec4eda6f5c0f2ec406d16045534
8f64fd21bafa180e6cbac5853ef65453f080385b3c53600af8360e938668e574"
post_extract() {
- mv ../recoil-${_recoil_version} 3rdparty/
+ mv grafX2-v$version/* .
+ mv recoil-${_recoil_version} 3rdparty/
touch 3rdparty/recoil-${_recoil_version}/.ok
}
From 133fc935657fb305308d8e0508508f7fda947149 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 2/9] gitflow: use create_wrksrc
---
srcpkgs/gitflow/template | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gitflow/template b/srcpkgs/gitflow/template
index 1ff82a670696..cb869243d20e 100644
--- a/srcpkgs/gitflow/template
+++ b/srcpkgs/gitflow/template
@@ -5,21 +5,24 @@ version=20120925
revision=3
_commit=15aab26490facf285acef56cb5d61025eacb3a69
_shflags_commit=2fb06af13de884e9680f14a00c82e52a67c867f1
+create_wrksrc=yes
hostmakedepends="perl"
depends="git"
short_desc="Git extensions to provide high-level repository operations"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://github.com/nvie/gitflow"
-distfiles="${homepage}/archive/${_commit}.tar.gz https://github.com/nvie/shFlags/archive/${_shflags_commit}.tar.gz"
-checksum="277ecb102afd45c3137d630de11ceac4b267a73d6a5f2ac41ccbd3d96b609ce7 a1c5782a78e106d0c6289a9412fffa376f4cd78f4f86af441eb7bf06cf664594"
+distfiles="${homepage}/archive/${_commit}.tar.gz
+ https://github.com/nvie/shFlags/archive/${_shflags_commit}.tar.gz"
+checksum="277ecb102afd45c3137d630de11ceac4b267a73d6a5f2ac41ccbd3d96b609ce7
+ a1c5782a78e106d0c6289a9412fffa376f4cd78f4f86af441eb7bf06cf664594"
wrksrc="$pkgname-$_commit"
post_extract() {
- cd $wrksrc
- rm -r shFlags
- cp -r ../shFlags-$_shflags_commit $wrksrc/shFlags
+ mv gitflow-${_commit}/* .
+ rmdir shFlags
+ mv shFlags-$_shflags_commit $wrksrc/shFlags
}
do_build() {
From 4f02302b1b27ad750bbddb5f609923cb7bbae089 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/9] flightgear: use create_wrksrc
---
srcpkgs/flightgear/template | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index 595b8021b527..45404e778ed4 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -3,10 +3,12 @@ pkgname=flightgear
version=2020.3.13
revision=1
# XXX: always keep in sync with simgear version!
+create_wrksrc=yes
build_style=cmake
build_helper="qemu"
configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
- -DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${XBPS_BUILDDIR}/fgdata/Translations
+ -DOpenGL_GL_PREFERENCE=GLVND
+ -DTRANSLATIONS_SRC_DIR=${XBPS_BUILDDIR}/$pkgname-$version/fgdata/Translations
-DSYSTEM_SQLITE=ON -DSYSTEM_FLITE=ON"
hostmakedepends="gettext pkg-config qt5-tools"
makedepends="MesaLib-devel boost-devel freealut-devel libevent-devel
@@ -37,10 +39,14 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo"
fi
+post_extract() {
+ mv flightgear-$version/* .
+}
+
flightgear-data_package() {
short_desc+=" - data files"
pkg_install() {
vmkdir usr/share/flightgear
- mv ${XBPS_BUILDDIR}/fgdata ${PKGDESTDIR}/usr/share/flightgear
+ mv fgdata ${PKGDESTDIR}/usr/share/flightgear
}
}
From 8e67d012788f1179cc025483308672baea48f23d 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:00 +0700
Subject: [PATCH 4/9] nsjail: use create_wrksrc
---
srcpkgs/nsjail/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template
index d115bcc43792..346348fdf17b 100644
--- a/srcpkgs/nsjail/template
+++ b/srcpkgs/nsjail/template
@@ -2,6 +2,7 @@
pkgname=nsjail
version=3.0
revision=9
+create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="bison flex pkg-config protobuf which"
makedepends="libnl3-devel protobuf-devel"
@@ -21,8 +22,9 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
fi
post_extract() {
+ mv nsjail-$version/* .
rmdir kafel
- mv ../kafel-* kafel
+ mv kafel-* kafel
}
post_patch() {
From f49ade8821b01d7dba3f110f559d46d099093e5c 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:00 +0700
Subject: [PATCH 5/9] leocad: use create_wrksrc
---
srcpkgs/leocad/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/leocad/template b/srcpkgs/leocad/template
index cd81c17b1e21..4010c69a2be1 100644
--- a/srcpkgs/leocad/template
+++ b/srcpkgs/leocad/template
@@ -3,6 +3,7 @@ pkgname=leocad
version=21.06
revision=1
_lib_version=20.03
+create_wrksrc=yes
build_style=qmake
configure_args="DISABLE_UPDATE_CHECK=1"
hostmakedepends="qt5-host-tools qt5-qmake unzip"
@@ -17,7 +18,7 @@ checksum="bd28c47f920fa1bc458b6e5f476b93ccc1aa40e30158a3dd2397368cc3d79099
88d6d28b3a494a15ae63e984c1e732e28362fabc2e145ffab828fed2eb5e3632"
post_extract() {
- mv ../library.bin .
+ mv leocad-${version}/* .
}
leocad-data_package() {
From 4cb6a3408282366099eecd20ddab783f792eb649 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:00 +0700
Subject: [PATCH 6/9] arena: no check permissions
---
srcpkgs/arena/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/arena/template b/srcpkgs/arena/template
index 0a82fcea57b9..d53f52265798 100644
--- a/srcpkgs/arena/template
+++ b/srcpkgs/arena/template
@@ -8,6 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:freeware"
homepage="http://www.playwitharena.de"
restricted=yes
+nocheckperms="database"
case "$XBPS_TARGET_MACHINE" in
armv7l)
@@ -33,7 +34,7 @@ nostrip=yes
do_install() {
vmkdir opt/arena
vcopy ${wrksrc}/* opt/arena
- chmod -R a+rw ${DESTDIR}/opt/arena
+ chmod -R a+rw ${DESTDIR}/opt/arena/Databases
case "$XBPS_TARGET_MACHINE" in
armv7l)
From 8ac5b919cb5bc80a511743bdf046ff1ee202fa68 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:02 +0700
Subject: [PATCH 7/9] cavestory: use create_wrksrc
---
srcpkgs/cavestory/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cavestory/template b/srcpkgs/cavestory/template
index b08211e1419a..3a165e9f2c26 100644
--- a/srcpkgs/cavestory/template
+++ b/srcpkgs/cavestory/template
@@ -3,7 +3,7 @@ pkgname=cavestory
version=1.2
revision=2
archs="x86_64 i686"
-wrksrc=linuxDoukutsu-1.01
+create_wrksrc=yes
short_desc="Japanese side-scrolling platformer game"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="custom: proprietary"
@@ -17,12 +17,12 @@ nopie=yes
do_install() {
vmkdir usr/libexec/cavestory
- vcopy Config.dat usr/libexec/cavestory
- vcopy data usr/libexec/cavestory
- vdoc doc/readme.txt
- vdoc doc/configfileformat.txt
- mv ../linuxDoukutsu-${version}/doukutsu_${XBPS_TARGET_WORDSIZE}bits doukutsu.bin
- vinstall doukutsu.bin 755 usr/libexec/cavestory
+ vcopy linuxDoukutsu-1.01/Config.dat usr/libexec/cavestory
+ vcopy linuxDoukutsu-1.01/data usr/libexec/cavestory
+ vdoc linuxDoukutsu-1.01/doc/readme.txt
+ vdoc linuxDoukutsu-1.01/doc/configfileformat.txt
+ vinstall linuxDoukutsu-${version}/doukutsu_${XBPS_TARGET_WORDSIZE}bits \
+ 755 usr/libexec/cavestory doukutsu.bin
vbin ${FILESDIR}/cavestory
vinstall ${FILESDIR}/cavestory.desktop 644 usr/share/applications/
vinstall ${FILESDIR}/cavestory.png 644 usr/share/pixmaps/
From 8356d464c144a516eb759309c47ef89ad637d43e 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:06 +0700
Subject: [PATCH 8/9] hunspell-el_GR: fix after auto-create_wrksrc
---
srcpkgs/hunspell-el_GR/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/hunspell-el_GR/template b/srcpkgs/hunspell-el_GR/template
index 4702ce1733b2..ee3d39b031d0 100644
--- a/srcpkgs/hunspell-el_GR/template
+++ b/srcpkgs/hunspell-el_GR/template
@@ -2,7 +2,6 @@
pkgname=hunspell-el_GR
version=0.4.0
revision=2
-create_wrksrc=yes
short_desc="Greek el_GR dictionary for hunspell"
maintainer="Nicholas Christopoulos <nereus@freemail.gr>"
license="GPL-2.0-only"
@@ -11,6 +10,6 @@ distfiles="${SOURCEFORGE_SITE}/orthos-spell/v.${version}./orthos-${version}.tar.
checksum=63d355ddb7b6c6f7a5221b33d7d7646c49bfa08f61e3e6fb31416a315bdfc217
do_install() {
- vinstall v.${version}/dicts/el_GR/el_GR.aff 644 /usr/share/hunspell
- vinstall v.${version}/dicts/el_GR/el_GR.dic 644 /usr/share/hunspell
+ vinstall dicts/el_GR/el_GR.aff 644 /usr/share/hunspell
+ vinstall dicts/el_GR/el_GR.dic 644 /usr/share/hunspell
}
From 7c41df096ff013a82f31f1b7c5394da38905cf03 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 9/9] 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 }
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
2022-10-31 12:27 [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc sgn
` (4 preceding siblings ...)
2022-11-01 6:24 ` sgn
@ 2022-11-01 7:34 ` sgn
2022-11-01 8:16 ` sgn
` (8 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2022-11-01 7:34 UTC (permalink / raw)
To: ml
[-- 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: 9905 bytes --]
From 691409d76aa9f2549232d073f5fdc3c5a811b805 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:06 +0700
Subject: [PATCH 1/8] grafx2: use create_wrksrc
---
srcpkgs/grafx2/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/grafx2/template b/srcpkgs/grafx2/template
index 724f8fa65765..d9ae5509e634 100644
--- a/srcpkgs/grafx2/template
+++ b/srcpkgs/grafx2/template
@@ -3,7 +3,7 @@ pkgname=grafx2
version=2.6
revision=2
_recoil_version=4.3.1
-wrksrc="grafX2-v${version}"
+create_wrksrc=yes
build_wrksrc="src"
build_style=gnu-makefile
make_build_args="API=sdl2"
@@ -21,7 +21,8 @@ checksum="1d679216e481b0c22d1d160eb1f66ed6ef2c1ec4eda6f5c0f2ec406d16045534
8f64fd21bafa180e6cbac5853ef65453f080385b3c53600af8360e938668e574"
post_extract() {
- mv ../recoil-${_recoil_version} 3rdparty/
+ mv grafX2-v$version/* .
+ mv recoil-${_recoil_version} 3rdparty/
touch 3rdparty/recoil-${_recoil_version}/.ok
}
From 133fc935657fb305308d8e0508508f7fda947149 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 2/8] gitflow: use create_wrksrc
---
srcpkgs/gitflow/template | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/gitflow/template b/srcpkgs/gitflow/template
index 1ff82a670696..cb869243d20e 100644
--- a/srcpkgs/gitflow/template
+++ b/srcpkgs/gitflow/template
@@ -5,21 +5,24 @@ version=20120925
revision=3
_commit=15aab26490facf285acef56cb5d61025eacb3a69
_shflags_commit=2fb06af13de884e9680f14a00c82e52a67c867f1
+create_wrksrc=yes
hostmakedepends="perl"
depends="git"
short_desc="Git extensions to provide high-level repository operations"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://github.com/nvie/gitflow"
-distfiles="${homepage}/archive/${_commit}.tar.gz https://github.com/nvie/shFlags/archive/${_shflags_commit}.tar.gz"
-checksum="277ecb102afd45c3137d630de11ceac4b267a73d6a5f2ac41ccbd3d96b609ce7 a1c5782a78e106d0c6289a9412fffa376f4cd78f4f86af441eb7bf06cf664594"
+distfiles="${homepage}/archive/${_commit}.tar.gz
+ https://github.com/nvie/shFlags/archive/${_shflags_commit}.tar.gz"
+checksum="277ecb102afd45c3137d630de11ceac4b267a73d6a5f2ac41ccbd3d96b609ce7
+ a1c5782a78e106d0c6289a9412fffa376f4cd78f4f86af441eb7bf06cf664594"
wrksrc="$pkgname-$_commit"
post_extract() {
- cd $wrksrc
- rm -r shFlags
- cp -r ../shFlags-$_shflags_commit $wrksrc/shFlags
+ mv gitflow-${_commit}/* .
+ rmdir shFlags
+ mv shFlags-$_shflags_commit $wrksrc/shFlags
}
do_build() {
From 4f02302b1b27ad750bbddb5f609923cb7bbae089 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/8] flightgear: use create_wrksrc
---
srcpkgs/flightgear/template | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/flightgear/template b/srcpkgs/flightgear/template
index 595b8021b527..45404e778ed4 100644
--- a/srcpkgs/flightgear/template
+++ b/srcpkgs/flightgear/template
@@ -3,10 +3,12 @@ pkgname=flightgear
version=2020.3.13
revision=1
# XXX: always keep in sync with simgear version!
+create_wrksrc=yes
build_style=cmake
build_helper="qemu"
configure_args="-DFG_DATA_DIR:STRING=/usr/share/flightgear/fgdata
- -DOpenGL_GL_PREFERENCE=GLVND -DTRANSLATIONS_SRC_DIR=${XBPS_BUILDDIR}/fgdata/Translations
+ -DOpenGL_GL_PREFERENCE=GLVND
+ -DTRANSLATIONS_SRC_DIR=${XBPS_BUILDDIR}/$pkgname-$version/fgdata/Translations
-DSYSTEM_SQLITE=ON -DSYSTEM_FLITE=ON"
hostmakedepends="gettext pkg-config qt5-tools"
makedepends="MesaLib-devel boost-devel freealut-devel libevent-devel
@@ -37,10 +39,14 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo"
fi
+post_extract() {
+ mv flightgear-$version/* .
+}
+
flightgear-data_package() {
short_desc+=" - data files"
pkg_install() {
vmkdir usr/share/flightgear
- mv ${XBPS_BUILDDIR}/fgdata ${PKGDESTDIR}/usr/share/flightgear
+ mv fgdata ${PKGDESTDIR}/usr/share/flightgear
}
}
From 8e67d012788f1179cc025483308672baea48f23d 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:00 +0700
Subject: [PATCH 4/8] nsjail: use create_wrksrc
---
srcpkgs/nsjail/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/nsjail/template b/srcpkgs/nsjail/template
index d115bcc43792..346348fdf17b 100644
--- a/srcpkgs/nsjail/template
+++ b/srcpkgs/nsjail/template
@@ -2,6 +2,7 @@
pkgname=nsjail
version=3.0
revision=9
+create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="bison flex pkg-config protobuf which"
makedepends="libnl3-devel protobuf-devel"
@@ -21,8 +22,9 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
fi
post_extract() {
+ mv nsjail-$version/* .
rmdir kafel
- mv ../kafel-* kafel
+ mv kafel-* kafel
}
post_patch() {
From f49ade8821b01d7dba3f110f559d46d099093e5c 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:00 +0700
Subject: [PATCH 5/8] leocad: use create_wrksrc
---
srcpkgs/leocad/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/leocad/template b/srcpkgs/leocad/template
index cd81c17b1e21..4010c69a2be1 100644
--- a/srcpkgs/leocad/template
+++ b/srcpkgs/leocad/template
@@ -3,6 +3,7 @@ pkgname=leocad
version=21.06
revision=1
_lib_version=20.03
+create_wrksrc=yes
build_style=qmake
configure_args="DISABLE_UPDATE_CHECK=1"
hostmakedepends="qt5-host-tools qt5-qmake unzip"
@@ -17,7 +18,7 @@ checksum="bd28c47f920fa1bc458b6e5f476b93ccc1aa40e30158a3dd2397368cc3d79099
88d6d28b3a494a15ae63e984c1e732e28362fabc2e145ffab828fed2eb5e3632"
post_extract() {
- mv ../library.bin .
+ mv leocad-${version}/* .
}
leocad-data_package() {
From 4cb6a3408282366099eecd20ddab783f792eb649 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:00 +0700
Subject: [PATCH 6/8] arena: no check permissions
---
srcpkgs/arena/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/arena/template b/srcpkgs/arena/template
index 0a82fcea57b9..d53f52265798 100644
--- a/srcpkgs/arena/template
+++ b/srcpkgs/arena/template
@@ -8,6 +8,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:freeware"
homepage="http://www.playwitharena.de"
restricted=yes
+nocheckperms="database"
case "$XBPS_TARGET_MACHINE" in
armv7l)
@@ -33,7 +34,7 @@ nostrip=yes
do_install() {
vmkdir opt/arena
vcopy ${wrksrc}/* opt/arena
- chmod -R a+rw ${DESTDIR}/opt/arena
+ chmod -R a+rw ${DESTDIR}/opt/arena/Databases
case "$XBPS_TARGET_MACHINE" in
armv7l)
From 8ac5b919cb5bc80a511743bdf046ff1ee202fa68 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:02 +0700
Subject: [PATCH 7/8] cavestory: use create_wrksrc
---
srcpkgs/cavestory/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/cavestory/template b/srcpkgs/cavestory/template
index b08211e1419a..3a165e9f2c26 100644
--- a/srcpkgs/cavestory/template
+++ b/srcpkgs/cavestory/template
@@ -3,7 +3,7 @@ pkgname=cavestory
version=1.2
revision=2
archs="x86_64 i686"
-wrksrc=linuxDoukutsu-1.01
+create_wrksrc=yes
short_desc="Japanese side-scrolling platformer game"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="custom: proprietary"
@@ -17,12 +17,12 @@ nopie=yes
do_install() {
vmkdir usr/libexec/cavestory
- vcopy Config.dat usr/libexec/cavestory
- vcopy data usr/libexec/cavestory
- vdoc doc/readme.txt
- vdoc doc/configfileformat.txt
- mv ../linuxDoukutsu-${version}/doukutsu_${XBPS_TARGET_WORDSIZE}bits doukutsu.bin
- vinstall doukutsu.bin 755 usr/libexec/cavestory
+ vcopy linuxDoukutsu-1.01/Config.dat usr/libexec/cavestory
+ vcopy linuxDoukutsu-1.01/data usr/libexec/cavestory
+ vdoc linuxDoukutsu-1.01/doc/readme.txt
+ vdoc linuxDoukutsu-1.01/doc/configfileformat.txt
+ vinstall linuxDoukutsu-${version}/doukutsu_${XBPS_TARGET_WORDSIZE}bits \
+ 755 usr/libexec/cavestory doukutsu.bin
vbin ${FILESDIR}/cavestory
vinstall ${FILESDIR}/cavestory.desktop 644 usr/share/applications/
vinstall ${FILESDIR}/cavestory.png 644 usr/share/pixmaps/
From 53e7e3489ebed83f559a626ad1296490b964cabe 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:06 +0700
Subject: [PATCH 8/8] hunspell-el_GR: fix after auto-create_wrksrc
---
srcpkgs/hunspell-el_GR/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/hunspell-el_GR/template b/srcpkgs/hunspell-el_GR/template
index 4702ce1733b2..df84906765ea 100644
--- a/srcpkgs/hunspell-el_GR/template
+++ b/srcpkgs/hunspell-el_GR/template
@@ -2,7 +2,7 @@
pkgname=hunspell-el_GR
version=0.4.0
revision=2
-create_wrksrc=yes
+wrksrc="v.$version"
short_desc="Greek el_GR dictionary for hunspell"
maintainer="Nicholas Christopoulos <nereus@freemail.gr>"
license="GPL-2.0-only"
@@ -11,6 +11,6 @@ distfiles="${SOURCEFORGE_SITE}/orthos-spell/v.${version}./orthos-${version}.tar.
checksum=63d355ddb7b6c6f7a5221b33d7d7646c49bfa08f61e3e6fb31416a315bdfc217
do_install() {
- vinstall v.${version}/dicts/el_GR/el_GR.aff 644 /usr/share/hunspell
- vinstall v.${version}/dicts/el_GR/el_GR.dic 644 /usr/share/hunspell
+ vinstall dicts/el_GR/el_GR.aff 644 /usr/share/hunspell
+ vinstall dicts/el_GR/el_GR.dic 644 /usr/share/hunspell
}
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
2022-10-31 12:27 [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc sgn
` (5 preceding siblings ...)
2022-11-01 7:34 ` sgn
@ 2022-11-01 8:16 ` sgn
2022-11-01 9:13 ` sgn
` (7 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2022-11-01 8:16 UTC (permalink / raw)
To: ml
[-- 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: 11762 bytes --]
From 662f29352e7a9afe18b4656fdb498f27e6134ee4 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:06 +0700
Subject: [PATCH 1/9] hddtemp: fix after auto-create_wrksrc
---
srcpkgs/hddtemp/template | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hddtemp/template b/srcpkgs/hddtemp/template
index 787193f86e79..2402b9ca74a3 100644
--- a/srcpkgs/hddtemp/template
+++ b/srcpkgs/hddtemp/template
@@ -16,10 +16,14 @@ distfiles="
checksum="
618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b
6f1ddaa9fbc90ea5c00b949e0981b78c5014e109de88804ae2512209091eae56"
+skip_extraction="hddtemp_${version/.b/-b}-53.diff.gz"
+
+post_extract() {
+ zcat ${XBPS_SRCDISTDIR}/${pkgname}-${version}/$skip_extraction |
+ patch -Np1 -F0
+}
pre_configure() {
- patch -p1 -i ../hddtemp_${version/.b/-b}-53.diff
- rm ../hddtemp_${version/.b/-b}-53.diff
sed -i 's|/etc/hddtemp.db|/usr/share/hddtemp/hddtemp.db|' doc/hddtemp.8
}
post_install() {
From cd05348170df1750f841546aa284168264a31948 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:08 +0700
Subject: [PATCH 2/9] mons: use create_wrksrc
---
srcpkgs/mons/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/mons/template b/srcpkgs/mons/template
index 447c81881bb5..f3a119991c27 100644
--- a/srcpkgs/mons/template
+++ b/srcpkgs/mons/template
@@ -2,6 +2,7 @@
pkgname=mons
version=0.8.2
revision=2
+create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="help2man"
depends="libXrandr"
@@ -15,8 +16,9 @@ checksum="73cf0e21c32206acec128c050c5905ee48412234f77c72fc4c1640cb53861160
4f9ea887751765e0cba26397a3534b5a254e2d93ea41606e39db402ce25826d9"
post_extract() {
+ mv mons-$version/* .
rm -r libshlist
- mv "../libshlist-1.1" libshlist
+ mv libshlist-1.1 libshlist
}
post_install() {
From 443a5debd56de8e742ee20cd737d2975a79a6d1d 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:11 +0700
Subject: [PATCH 3/9] poppler: use create_wrksrc
---
srcpkgs/poppler/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index c34698d6bd75..1bb3ff0720f3 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -6,6 +6,7 @@ pkgname=poppler
version=22.07.0
revision=2
_testVersion=920c89f8f43bdfe8966c8e397e7f67f5302e9435
+create_wrksrc=yes
build_style=cmake
build_helper="gir"
configure_args="-DENABLE_UNSTABLE_API_ABI_HEADERS=ON -DENABLE_CPP=ON
@@ -30,7 +31,8 @@ build_options="gir boost"
build_options_default="gir boost"
post_extract() {
- mv ../test-${_testVersion} testdatadir
+ mv poppler-*/* .
+ mv test-${_testVersion} testdatadir
}
libpoppler_package() {
From ac704110fc88ea2f417d3b12ab1753c0ce09e2eb 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:11 +0700
Subject: [PATCH 4/9] pijul: use create_wrksrc
---
srcpkgs/pijul/patches/bindgen.patch | 2 +-
srcpkgs/pijul/template | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch
index 04ccc8381aae..f76431e4e333 100644
--- a/srcpkgs/pijul/patches/bindgen.patch
+++ b/srcpkgs/pijul/patches/bindgen.patch
@@ -6,4 +6,4 @@
version = "0.2"
+
+[patch.crates-io]
-+"sequoia-rfc2822" = {path = '/builddir/sequoia-v0.9.0/rfc2822'}
++"sequoia-rfc2822" = {path = './sequoia/rfc2822'}
diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template
index 53fb1c83ebe5..a6a6d048b1ec 100644
--- a/srcpkgs/pijul/template
+++ b/srcpkgs/pijul/template
@@ -2,6 +2,7 @@
pkgname=pijul
version=0.12.2
revision=5
+create_wrksrc=yes
build_style=cargo
_sequoia_ver=0.9.0
hostmakedepends="pkg-config clang"
@@ -15,6 +16,11 @@ distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${ver
checksum="f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889
71823c88b9666611f3cfa6b1d923bd66fda92fa6a53368b195bd2f962fdf7f4b"
+post_extract() {
+ mv pijul-*/* .
+ mv sequoia-* sequoia
+}
+
# We only want to install the binary, so don't run cargo install
do_install() {
vbin target/${RUST_TARGET}/release/pijul
From 5bd10eee9dfaab9b075d3c8710a99c473f7e9942 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:13 +0700
Subject: [PATCH 5/9] sbcl: use create_wrksrc
---
srcpkgs/sbcl/patches/ppc-musl.patch | 12 ++++++------
srcpkgs/sbcl/template | 7 ++++++-
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/sbcl/patches/ppc-musl.patch b/srcpkgs/sbcl/patches/ppc-musl.patch
index 91a347f21f33..ad0e0bc08467 100644
--- a/srcpkgs/sbcl/patches/ppc-musl.patch
+++ b/srcpkgs/sbcl/patches/ppc-musl.patch
@@ -1,5 +1,5 @@
---- a/src/runtime/ppc-linux-os.c
-+++ b/src/runtime/ppc-linux-os.c
+--- a/sbcl/src/runtime/ppc-linux-os.c
++++ b/sbcl/src/runtime/ppc-linux-os.c
@@ -33,6 +33,7 @@
#include <sys/stat.h>
#include <unistd.h>
@@ -8,8 +8,8 @@
#include "validate.h"
#include "ppc-linux-mcontext.h"
---- a/src/runtime/os-common.c
-+++ b/src/runtime/os-common.c
+--- a/sbcl/src/runtime/os-common.c
++++ b/sbcl/src/runtime/os-common.c
@@ -31,6 +31,9 @@
#if defined(LISP_FEATURE_OS_PROVIDES_DLOPEN) && !defined(LISP_FEATURE_WIN32)
# include <dlfcn.h>
@@ -20,8 +20,8 @@
/*
* historically, this used sysconf to select the runtime page size
---- a/src/runtime/ppc-arch.c
-+++ b/src/runtime/ppc-arch.c
+--- a/sbcl/src/runtime/ppc-arch.c
++++ b/sbcl/src/runtime/ppc-arch.c
@@ -10,6 +10,7 @@
*/
diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template
index 7d401b5e166c..fafab7d36d29 100644
--- a/srcpkgs/sbcl/template
+++ b/srcpkgs/sbcl/template
@@ -2,6 +2,8 @@
pkgname=sbcl
version=2.2.9
revision=1
+create_wrksrc="required"
+build_wrksrc=sbcl
# make sure the sbcl option in maxima is enabled for the same archs
archs="i686 x86_64* armv7l aarch64 ppc64le*"
hostmakedepends="iana-etc texinfo"
@@ -39,6 +41,10 @@ i686*|ppc*|*-musl)
;;
esac
+post_extract() {
+ mv sbcl-${version} sbcl
+}
+
do_build() {
printf '"%s.void.%s"\n' "$version" "$revision" >version.lisp-expr
export CFLAGS+=" -D_GNU_SOURCE -fno-omit-frame-pointer -DSBCL_HOME=/usr/lib/sbcl"
@@ -59,7 +65,6 @@ sbcl-source_package() {
depends="${sourcepkg}>=${version}_${revision}"
short_desc+=" -- source files"
pkg_install() {
- cd $wrksrc
./clean.sh
vmkdir usr/lib/sbcl
vcopy src usr/lib/sbcl
From 250c159cc99262226c20d872cc92a281e1810212 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:14 +0700
Subject: [PATCH 6/9] schroot: fix build after create_wrksrc
---
srcpkgs/schroot/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template
index 1a6dfe8ef1a0..cd011b5043bc 100644
--- a/srcpkgs/schroot/template
+++ b/srcpkgs/schroot/template
@@ -55,10 +55,12 @@ checksum="
3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b
7bd4e0c2709979362c86a86c10d2b23d290d26e1a2d301a602e829327f483ec1"
nocross=yes
+skip_extraction="schroot_${version}-${_debian_version}.debian.tar.xz"
-pre_configure() {
- cat ../debian/patches/series | while read p; do
- patch -p1 -i ../debian/patches/$p
+post_extract() {
+ bsdtar -xf $XBPS_SRCDISTDIR/schroot-${version}/$skip_extraction
+ cat debian/patches/series | while read p; do
+ patch -Np1 -F0 -i debian/patches/$p
done
}
From 1c4973ed2009a75a2c5b012f436eaa867878f373 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 7/9] openbsd-netcat: use create_wrksrc
---
srcpkgs/openbsd-netcat/template | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/openbsd-netcat/template b/srcpkgs/openbsd-netcat/template
index 9c458b8e23cf..4b09dfe9a28b 100644
--- a/srcpkgs/openbsd-netcat/template
+++ b/srcpkgs/openbsd-netcat/template
@@ -2,7 +2,7 @@
pkgname=openbsd-netcat
version=1.219
revision=1
-wrksrc="netcat-openbsd-${version%p*}"
+create_wrksrc=yes
hostmakedepends="pkg-config"
makedepends="libbsd-devel"
short_desc="TCP/IP swiss army knife (OpenBSD/Debian variant)"
@@ -19,8 +19,12 @@ alternatives="
nc:nc:/usr/bin/openbsd-nc
nc:nc.1:/usr/share/man/man1/openbsd-nc.1"
+post_extract() {
+ mv netcat-openbsd-${version}/* .
+ ( cd debian/patches; xargs cat <series; ) | patch -p1
+}
+
do_build() {
- ( cd ../debian/patches; xargs cat <series; ) | patch -p1
case "$XBPS_TARGET_MACHINE" in
*-musl) # Add missing b64_ntop() and b64_pton() functions
cp ${FILESDIR}/base64.c .
@@ -35,5 +39,5 @@ do_build() {
do_install() {
vbin nc openbsd-nc
vman nc.1 openbsd-nc.1
- vlicense ../debian/copyright LICENSE
+ vlicense debian/copyright LICENSE
}
From 2dd2608371acee6a3d60437edfe49277ce73b20d 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:09 +0700
Subject: [PATCH 8/9] ocs-url: use create_wrksrc
---
srcpkgs/ocs-url/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/ocs-url/template b/srcpkgs/ocs-url/template
index 29c0d304f730..fd76eee398b7 100644
--- a/srcpkgs/ocs-url/template
+++ b/srcpkgs/ocs-url/template
@@ -2,7 +2,7 @@
pkgname=ocs-url
version=3.1.0
revision=2
-wrksrc="ocs-url-release-${version}"
+create_wrksrc=yes
build_style="qmake"
hostmakedepends="qt5-qmake kdeclarative-devel qt5-svg-devel qt5-declarative-devel"
makedepends="qt5-svg-devel kdeclarative-devel qt5-declarative-devel"
@@ -15,7 +15,8 @@ distfiles="${homepage}/-/archive/release-${version}/ocs-url-release-${version}.t
https://github.com/akiraohgaki/qtil/archive/v0.4.0.tar.gz"
checksum="d8c67920359c36eb0004221e5b5695fd04cbc9e93811c372837bdb2a8c9cbcc8
c1548d3f2ca5a2fc63fce60bea2c350dfcc656b03a4e00d86a9fdc0b43f22ec8"
+
post_extract() {
- mkdir ${wrksrc}/lib/qtil
- mv ${wrksrc}/../qtil-0.4.0/* ${wrksrc}/lib/qtil/
+ mv ocs-url-*/* .
+ mv qtil-0.4.0 lib/qtil
}
From c752c69dff99c590e7e1d39ba051ffa1a9b676de 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 9/9] 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 }
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
2022-10-31 12:27 [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc sgn
` (6 preceding siblings ...)
2022-11-01 8:16 ` sgn
@ 2022-11-01 9:13 ` sgn
2022-11-01 10:27 ` sgn
` (6 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2022-11-01 9:13 UTC (permalink / raw)
To: ml
[-- 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: 14322 bytes --]
From 0b942ccfb70896949669608584d7df09517f7afd 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:13 +0700
Subject: [PATCH 01/10] sc: fix build after auto-create_wrksrc
---
srcpkgs/sc/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/sc/template b/srcpkgs/sc/template
index 2f827708d669..0abe03d72101 100644
--- a/srcpkgs/sc/template
+++ b/srcpkgs/sc/template
@@ -14,9 +14,11 @@ distfiles="http://ibiblio.org/pub/linux/apps/financial/spreadsheet/sc-${version}
checksum="1997a00b6d82d189b65f6fd2a856a34992abc99e50d9ec463bbf1afb750d1765
37116b9619790564650c4090b4a6264c08aa59fa1e24c63ca073011cd70507cb"
CFLAGS='-DSYSV3'
+skip_extraction="sc_${version}-2.diff.gz"
post_extract() {
- patch -Np1 <../${pkgname}_${version}-2.diff
+ zcat $XBPS_SRCDISTDIR/$pkgname-$version/$skip_extraction |
+ patch -Np1
}
do_install() {
From f8e122481195edde62084dd29b79eb72b194909d 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:16 +0700
Subject: [PATCH 02/10] tcpflow: fix build
---
srcpkgs/tcpflow/template | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/tcpflow/template b/srcpkgs/tcpflow/template
index decc27a0a27c..6eaf1addccb5 100644
--- a/srcpkgs/tcpflow/template
+++ b/srcpkgs/tcpflow/template
@@ -2,7 +2,7 @@
pkgname=tcpflow
version=1.5.2
revision=3
-wrksrc="$pkgname-$pkgname-$version"
+create_wrksrc=yes
build_style=gnu-configure
hostmakedepends="automake"
makedepends="libpcap-devel zlib-devel openssl-devel boost-devel"
@@ -10,22 +10,26 @@ short_desc="Captures data transmitted as part of TCP connections"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-only"
homepage="https://github.com/simsong/tcpflow"
-_be13_commit=c81521d768bb78499c069fcd7c47adc8eee0350c
+_be20_commit=c81521d768bb78499c069fcd7c47adc8eee0350c
_dfxml_commit=c31224626cf5f6678d42cbcfbfcd4e6191c9a864
_httpparser_commit=6b05cce82da5c4d407e5576ab892bc20a17b0394
distfiles="https://github.com/simsong/tcpflow/archive/${pkgname}-${version}.tar.gz
https://github.com/nodejs/http-parser/archive/$_httpparser_commit.tar.gz
- https://github.com/simsong/be13_api/archive/$_be13_commit.tar.gz
+ https://github.com/simsong/be20_api/archive/$_be20_commit.tar.gz
https://github.com/simsong/dfxml/archive/$_dfxml_commit.tar.gz"
checksum="c4138dbf2ed9915aed92e8f5cd6d19db2c7d1caeb02191939d0bfa15e52fe600
b947bd185511fd28a12a30436bcbe8f765473a667cdb6f8f55888274d44f550f
- a682edf8469b7130b52e6f12dc7beea4bb60d4834d6de42904a3c0a1425cd5fe
+ c98cface83e074be790293bb1041df8968ef385a196e0990f5174883d2e1d8f4
358e4d3599c6e26f1dff85066e15e86025fc537466e8f4e35924922886eed86b"
-pre_configure() {
+post_extract() {
+ mv tcpflow-*/* .
rmdir src/{dfxml,be13_api,http-parser}
- ln -fsr ../be13_api-$_be13_commit src/be13_api
- ln -fsr ../dfxml-$_dfxml_commit src/dfxml
- ln -fsr ../http-parser-$_httpparser_commit src/http-parser
+ mv be??_api-$_be20_commit src/be13_api
+ mv dfxml-$_dfxml_commit src/dfxml
+ mv http-parser-$_httpparser_commit src/http-parser
+}
+
+pre_configure() {
autoreconf -fi
}
From dd365aac91676e4baee4f12b62c6c226566dd4cd 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:02 +0700
Subject: [PATCH 03/10] maturin: use create_wrksrc
---
srcpkgs/maturin/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/maturin/template b/srcpkgs/maturin/template
index 8270694bc1b9..79aa1f62d9b8 100644
--- a/srcpkgs/maturin/template
+++ b/srcpkgs/maturin/template
@@ -2,6 +2,7 @@
pkgname=maturin
version=0.13.6
revision=1
+create_wrksrc=yes
build_style=python3-module
build_helper="qemu rust"
hostmakedepends="python3-setuptools-rust python3-tomli python3-wheel cargo"
@@ -31,7 +32,8 @@ case "$XBPS_TARGET_MACHINE" in
esac
post_extract() {
- mv ../target-lexicon* target-lexicon
+ mv maturin-${version}/* .
+ mv target-lexicon-* target-lexicon
echo "[patch.crates-io]" >> Cargo.toml
echo "target-lexicon = { path = './target-lexicon' }" >> Cargo.toml
}
From eaf58098468c8108b021411d179083c6569ad40c 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:11 +0700
Subject: [PATCH 04/10] ppsspp: use create_wrksrc
---
srcpkgs/ppsspp/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/ppsspp/template b/srcpkgs/ppsspp/template
index 38308424f58b..19dbeb7f7b25 100644
--- a/srcpkgs/ppsspp/template
+++ b/srcpkgs/ppsspp/template
@@ -7,6 +7,7 @@ _SPIRV_Cross_commit=9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1
_armips_commit=7885552b208493a6a0f21663770c446c3ba65576
_discord_rpc_commit=963aa9f3e5ce81a4682c6ca3d136cddda614db33
_miniupnp_commit=3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e
+create_wrksrc=yes
build_style=cmake
configure_args="-DHEADLESS=1 -DUSE_SYSTEM_FFMPEG=1 -DUNITTEST=ON
-DUSING_QT_UI=$(vopt_if qt ON OFF) -DUSE_SYSTEM_ZSTD=ON"
@@ -47,16 +48,17 @@ build_options="wayland qt sdl2"
build_options_default="sdl2"
post_extract() {
+ mv ppsspp-${version}/* .
rmdir -v ${wrksrc}/ext/armips
- mv ${wrksrc}/../armips-${_armips_commit} ${wrksrc}/ext/armips
+ mv ${wrksrc}/armips-${_armips_commit} ${wrksrc}/ext/armips
rmdir -v ${wrksrc}/ext/glslang
- mv ${wrksrc}/../glslang-${_glslang_commit} ${wrksrc}/ext/glslang
+ mv ${wrksrc}/glslang-${_glslang_commit} ${wrksrc}/ext/glslang
rmdir -v ${wrksrc}/ext/SPIRV-Cross
- mv ${wrksrc}/../SPIRV-Cross-${_SPIRV_Cross_commit} ${wrksrc}/ext/SPIRV-Cross
+ mv ${wrksrc}/SPIRV-Cross-${_SPIRV_Cross_commit} ${wrksrc}/ext/SPIRV-Cross
rmdir -v ${wrksrc}/ext/discord-rpc
- mv ${wrksrc}/../discord-rpc-${_discord_rpc_commit} ${wrksrc}/ext/discord-rpc
+ mv ${wrksrc}/discord-rpc-${_discord_rpc_commit} ${wrksrc}/ext/discord-rpc
rmdir -v ${wrksrc}/ext/miniupnp
- mv ${wrksrc}/../miniupnp-${_miniupnp_commit} ${wrksrc}/ext/miniupnp
+ mv ${wrksrc}/miniupnp-${_miniupnp_commit} ${wrksrc}/ext/miniupnp
}
post_patch(){
From abd6af0b383c39c14f446e40cb09b6b73f2ea9ce 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:14 +0700
Subject: [PATCH 05/10] sc3-plugins: use create_wrksrc
---
srcpkgs/sc3-plugins/patches/cstdio.patch | 4 ++--
srcpkgs/sc3-plugins/template | 15 ++++++++++-----
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/sc3-plugins/patches/cstdio.patch b/srcpkgs/sc3-plugins/patches/cstdio.patch
index 9ffb2d2bac0e..ae5880b68f76 100644
--- a/srcpkgs/sc3-plugins/patches/cstdio.patch
+++ b/srcpkgs/sc3-plugins/patches/cstdio.patch
@@ -1,5 +1,5 @@
---- a/source/NHUGens/NHHall.cpp 2018-11-18 23:18:46.000000000 +0100
-+++ b/source/NHUGens/NHHall.cpp 2020-09-13 07:57:48.084435095 +0200
+--- a/sc3-plugins/source/NHUGens/NHHall.cpp 2018-11-18 23:18:46.000000000 +0100
++++ b/sc3-plugins/source/NHUGens/NHHall.cpp 2020-09-13 07:57:48.084435095 +0200
@@ -25,6 +25,7 @@
For more information, please refer to <http://unlicense.org>
*/
diff --git a/srcpkgs/sc3-plugins/template b/srcpkgs/sc3-plugins/template
index 45f54453e414..cdd0064b8ee9 100644
--- a/srcpkgs/sc3-plugins/template
+++ b/srcpkgs/sc3-plugins/template
@@ -2,10 +2,11 @@
pkgname=sc3-plugins
version=3.10.0
revision=2
-wrksrc="${pkgname}-Version-${version}"
_nova_simd_hash=2bdc68bc5704a42578300a4c18411df2405cb307
+create_wrksrc=yes
+build_wrksrc=sc3-plugins
build_style=cmake
-configure_args="-DSC_PATH=${XBPS_BUILDDIR}/SuperCollider-Source -DSUPERNOVA=ON -DSYSTEM_STK=ON"
+configure_args="-DSUPERNOVA=ON -DSYSTEM_STK=ON"
hostmakedepends="pkg-config"
makedepends="fftw-devel libstk-devel"
depends="supercollider"
@@ -21,12 +22,16 @@ checksum="b8144231ea1bfc1c9d8aa6780c7e963dfb642868794abbfd8ccab418ffbbdfbe
df9f280daaad56fdadb5fa75d492ee6a06762a41d7346aa473aa49c1ac9ec9c8"
post_extract() {
- rm -rf external_libraries/nova-simd
- mv ${XBPS_BUILDDIR}/nova-simd-${_nova_simd_hash} external_libraries/nova-simd
+ mv sc3-plugins-* sc3-plugins
+ rm -rf sc3-plugins/external_libraries/nova-simd
+ mv nova-simd-${_nova_simd_hash} sc3-plugins/external_libraries/nova-simd
+}
+
+pre_configure() {
+ configure_args+=" -DSC_PATH=${wrksrc}/SuperCollider-Source "
}
post_install() {
vmkdir usr/lib/SuperCollider/Extensions/SC3plugins/LadspaUGen
mv -v ${DESTDIR}/usr/{share,lib}/SuperCollider/Extensions/SC3plugins/LadspaUGen/ladspalist
- rm -rf ${XBPS_BUILDDIR}/SuperCollider-Source
}
From d00ca4241630f936bf441b734c57bd4373f6748e 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:15 +0700
Subject: [PATCH 06/10] stremio-shell: use create_wrksrc
---
srcpkgs/stremio-shell/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/stremio-shell/template b/srcpkgs/stremio-shell/template
index 5e498162abdf..ac133f6c3729 100644
--- a/srcpkgs/stremio-shell/template
+++ b/srcpkgs/stremio-shell/template
@@ -4,6 +4,7 @@ version=4.4.159
revision=1
_singleapplication_hash=f1e15081dc57a9c03f7f4f165677f18802e1437a
_libmpv_hash=822a41a1087daf2911fc336fbd9509f962158fef
+create_wrksrc=yes
build_style=qmake
hostmakedepends="qt5-host-tools qt5-qmake"
makedepends="mpv-devel qt5-webview-devel qt5-webengine-devel
@@ -28,10 +29,11 @@ checksum="aca0e5bf026e31399571f5cdc1485cbb2540e7ad7b981f10adb0e87ee47b9af5
skip_extraction="server.js stremio.asar"
post_extract() {
+ mv stremio-shell-$version/* .
rmdir deps/singleapplication
- mv ../SingleApplication-${_singleapplication_hash} deps/singleapplication
+ mv SingleApplication-${_singleapplication_hash} deps/singleapplication
rmdir deps/libmpv
- mv ../libmpv-${_libmpv_hash} deps/libmpv
+ mv libmpv-${_libmpv_hash} deps/libmpv
}
post_install() {
From 4681fbbc14a10f2ee89c3e95f18af4be1bb755ad 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:15 +0700
Subject: [PATCH 07/10] steam-fonts: broken distfiles
---
srcpkgs/steam-fonts/template | 1 +
1 file changed, 1 insertion(+)
diff --git a/srcpkgs/steam-fonts/template b/srcpkgs/steam-fonts/template
index 3b9de3c61c8b..33de3614c2d0 100644
--- a/srcpkgs/steam-fonts/template
+++ b/srcpkgs/steam-fonts/template
@@ -12,6 +12,7 @@ distfiles="https://support.steampowered.com/downloads/1974-YFKL-4947/SteamFonts.
checksum=a03bcc9581f2896cac39967633fc43546af5ed9d73d505a10cae4016797dfeb1
font_dirs="/usr/share/fonts/steam-fonts"
restricted=yes
+broken=dead-url
do_install() {
vmkdir usr/share/fonts/steam-fonts
From 7808b446da0f350e2f839499a7f80d4da6153ad7 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:17 +0700
Subject: [PATCH 08/10] tg_owt: fix build
---
srcpkgs/tg_owt/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tg_owt/template b/srcpkgs/tg_owt/template
index 1b81a7475ac0..d712ac678ec1 100644
--- a/srcpkgs/tg_owt/template
+++ b/srcpkgs/tg_owt/template
@@ -25,7 +25,7 @@ distfiles="https://github.com/desktop-app/tg_owt/archive/${_commit}.tar.gz
checksum="@b8a4b1a9e4f8936c02b4a31c19d6282a914df976b9cbdfadb3ae40ca1a185ac6
@1dd51820852df840c339bf3f18e6cf1166de33d5631a69cd1eae5b2b34c113e3
@b359ed4f5fd0321d807fd7301e66399c311c1fe6ab4c6a0f5538587d97ba4a8d"
-skip_extraction="${_libyuv_commit}.tar.gz ${_crc32c_commit}"
+skip_extraction="${_libyuv_commit}.tar.gz ${_crc32c_commit}.tar.gz"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
makedepends+=" musl-legacy-compat"
From a32ef028246dae88c66804b078dd7e1991ac2ba3 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:16 +0700
Subject: [PATCH 09/10] textadept: update checksum
---
srcpkgs/textadept/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/textadept/template b/srcpkgs/textadept/template
index e49056c0cb54..76fa8b663e70 100644
--- a/srcpkgs/textadept/template
+++ b/srcpkgs/textadept/template
@@ -24,7 +24,7 @@ distfiles="https://github.com/orbitalquark/textadept/archive/textadept_${version
https://github.com/orbitalquark/gtdialog/archive/64587546482a1a6324706d75c80b77d2f87118a4.zip
https://invisible-mirror.net/archives/cdk/cdk-5.0-20200923.tgz
http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz"
-checksum="87d67975b22952344e1bdcb330301b88cdfe8242e7710526cd344ab252499c2a
+checksum="55d153fba03aa2e12c2865f38f378154bbc7d2d3e3448a3682b46ee17056fb4c
4f2168684b4024dc3d6b267320fff1d729192047f4a1b79aeab9ec7c64f733ec
3b1e3cc3ee48bb158d1d666c7c86d190905c973918914876f6ab3712f8dd7d20
ccd5b3d615116b8c4376086cf1d03b6ef1f67a565e57446b15eba3f39ef0c180
From 0b94e636c785a2fafdb8e6aba8e390cf35f7ae41 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 10/10] 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 }
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
2022-10-31 12:27 [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc sgn
` (7 preceding siblings ...)
2022-11-01 9:13 ` sgn
@ 2022-11-01 10:27 ` sgn
2022-11-01 11:02 ` sgn
` (5 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2022-11-01 10:27 UTC (permalink / raw)
To: ml
[-- 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: 13172 bytes --]
From 6c1172e1a94a50ae12ac7ab014c2bf8bce61c347 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 01/10] lilypond-doc: fix build after auto-create_wrksrc
---
srcpkgs/lilypond-doc/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index ae03279b9230..4a5a4c3ef1eb 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -3,7 +3,6 @@ pkgname=lilypond-doc
# should be kept in sync with 'lilypond'
version=2.23.10
revision=1
-create_wrksrc=yes
short_desc="Documentation for the lilypond music engraving program"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-3.0-or-later, GFDL-1.3-or-later"
@@ -12,7 +11,7 @@ distfiles="https://gitlab.com/lilypond/lilypond/-/releases/v${version}/downloads
checksum=8927270ec2c2dff2e0984727543a467b49ff7cb3adfd98b81a15b51277bfba75
do_install() {
- vmkdir usr
- rm share/info/lilypond
- mv share ${DESTDIR}/usr/
+ vmkdir usr/share
+ rm info/lilypond
+ mv * ${DESTDIR}/usr/share
}
From 4d97f98d541a35d78e241c44ca876528570e0479 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:08 +0700
Subject: [PATCH 02/10] minisat: fix build after auto-create_wrksrc
---
srcpkgs/minisat/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/minisat/template b/srcpkgs/minisat/template
index e462c8ba34a6..374c3da51970 100644
--- a/srcpkgs/minisat/template
+++ b/srcpkgs/minisat/template
@@ -5,20 +5,21 @@ revision=2
wrksrc=minisat
build_wrksrc=simp
build_style=gnu-makefile
-make_build_args="MROOT=${XBPS_BUILDDIR}/${wrksrc} CFLAGS="-I${XBPS_BUILDDIR}/${wrksrc}" r"
makedepends="zlib-devel"
archs="i686 x86_64"
short_desc="A minimalistic and high-performance SAT solver"
maintainer="Tai Chi Minh Ralph Eastwood <tcmreastwood@gmail.com>"
license="MIT"
homepage="http://minisat.se/MiniSat.html"
-distfiles="http://minisat.se/downloads/minisat-2.2.0.tar.gz"
+distfiles="http://minisat.se/downloads/minisat-${version}.tar.gz"
checksum=92957d851cdc3baddfe07b5fc80ed5a0237c489d0c52ae72f62844b3b46d7808
-do_install() {
- vbin minisat_release minisat
+do_build() {
+ CFLAGS+=" -I${wrksrc}"
+ make ${makejobs} MROOT=${wrksrc} r
}
-post_install() {
+do_install() {
+ vbin minisat_release minisat
vlicense ../LICENSE
}
From 0186fecbc451446615be6c363d6e2557abcf4255 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:09 +0700
Subject: [PATCH 03/10] openjdk15-bootstrap: use create_wrksrc
---
srcpkgs/openjdk15-bootstrap/template | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index c1ce79ae2696..91340d925063 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -6,6 +6,8 @@ _java_ver="${version%%.*}"
_jdk_update="${version#*+}"
_base_version="${version%+*}"
_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+create_wrksrc=yes
+build_wrksrc=openjdk
archs="x86_64* i686* aarch64* armv7* ppc64*"
wrksrc="jdk${_java_ver}u-jdk-${version}"
build_style=gnu-configure
@@ -18,7 +20,7 @@ configure_args="--disable-warnings-as-errors
--with-libpng=system
--with-lcms=system
--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-jobs=${XBPS_ORIG_MAKEJOBS}
--with-version-pre=
@@ -70,9 +72,10 @@ if [ -n "$XBPS_DEBUG_PKGS" ]; then
fi
post_extract() {
- chmod +x configure
+ mv jdk* openjdk
+ chmod +x openjdk/configure
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- rm -r src/jdk.hotspot.agent
+ rm -r openjdk/src/jdk.hotspot.agent
fi
}
@@ -118,8 +121,3 @@ post_install() {
vlicense ASSEMBLY_EXCEPTION
vlicense LICENSE
}
-
-do_clean() {
- # clean up gtest
- rm -rf ${XBPS_BUILDDIR}/googletest-release-*
-}
From 85ce3f04b9786a76cc82c8d28133d417a374d78d 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:09 +0700
Subject: [PATCH 04/10] openjdk16-bootstrap: use create_wrksrc
---
srcpkgs/openjdk16-bootstrap/template | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 011612e0a966..e4d09511cee9 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -7,7 +7,8 @@ _jdk_update="${version#*+}"
_base_version="${version%+*}"
_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
archs="x86_64* i686* aarch64* armv7* ppc64*"
-wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
+create_wrksrc=yes
+build_wrksrc=openjdk
build_style=gnu-configure
configure_args="--disable-warnings-as-errors
--enable-unlimited-crypto
@@ -17,7 +18,7 @@ configure_args="--disable-warnings-as-errors
--with-libpng=system
--with-lcms=system
--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-jobs=${XBPS_ORIG_MAKEJOBS}
--with-version-pre=
@@ -70,9 +71,10 @@ if [ -n "$XBPS_DEBUG_PKGS" ]; then
fi
post_extract() {
- chmod +x configure
+ mv jdk* openjdk
+ chmod +x openjdk/configure
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- rm -r src/jdk.hotspot.agent
+ rm -r openjdk/src/jdk.hotspot.agent
fi
}
@@ -118,8 +120,3 @@ post_install() {
vlicense ASSEMBLY_EXCEPTION
vlicense LICENSE
}
-
-do_clean() {
- # clean up gtest
- rm -rf ${XBPS_BUILDDIR}/googletest-release-*
-}
From c762e1e6a79aa0a26ee156913c3ef5b0ba85ae1e 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:09 +0700
Subject: [PATCH 05/10] 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 694b69e63db9..53dc975a16da 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
From 26d28a1d4586cafd7615186fd45bb41dbdeff35b 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:10 +0700
Subject: [PATCH 06/10] openjdk8: use create_wrksrc
---
srcpkgs/openjdk8/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 5060224eaab8..25a93b300a92 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -13,7 +13,7 @@ _jdk_home="usr/lib/jvm/java-1.8-openjdk"
# otherwise the same as the normal one, just with aarch64 port added
_repo_ver="aarch64-shenandoah-jdk${version/b/-b}"
archs="x86_64* i686* aarch64* arm* ppc64*"
-wrksrc="jdk8u-shenandoah-aarch64-shenandoah-jdk8u${_jdk_update}-b${_jdk_build}"
+create_wrksrc=yes
build_style=gnu-configure
configure_args="
--prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
@@ -139,9 +139,10 @@ alternatives="
"
post_extract() {
+ mv jdk8u*/* .
chmod +x configure
for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do
- mv ../${subrepo}-${_repo_ver} ${subrepo}
+ mv ${subrepo}-${_repo_ver} ${subrepo}
done
# gcc complains about the signed shift left
From 073ad5018c6dafb0c9531ede0d82d41f02b1d115 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:10 +0700
Subject: [PATCH 07/10] openjdk9-bootstrap: use create_wrksrc
---
srcpkgs/openjdk9-bootstrap/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index 7fecb035d89e..d42b6ea3874a 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -5,7 +5,7 @@ version=9.0.4p12
revision=3
_repo_ver=${version/p/+}
archs="x86_64* i686* aarch64* arm* ppc64*"
-wrksrc="jdk9u-jdk-${_repo_ver}"
+create_wrksrc=yes
build_style=gnu-configure
configure_args="
--prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -78,9 +78,10 @@ fi
export CCACHE_DISABLE=1
post_extract() {
+ mv jdk9u*/* .
chmod +x configure
for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do
- mv ../${subrepo}-jdk-${_repo_ver} ${subrepo}
+ mv ${subrepo}-jdk-${_repo_ver} ${subrepo}
done
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From 8b50803f8d24b3cd1b79fea4c207fa8162eb97c2 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:10 +0700
Subject: [PATCH 08/10] opensonic: use create_wrksrc
---
srcpkgs/opensonic/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/opensonic/template b/srcpkgs/opensonic/template
index 4dff7f06bd79..d3fc9a20d91f 100644
--- a/srcpkgs/opensonic/template
+++ b/srcpkgs/opensonic/template
@@ -2,7 +2,7 @@
pkgname=opensonic
version=0.1.4
revision=10
-wrksrc="opensnc-src-${version}"
+create_wrksrc=yes
build_style=cmake
configure_args="-DCMAKE_C_STANDARD_LIBRARIES=-lalleg"
hostmakedepends="allegro4-devel cmake"
@@ -22,7 +22,7 @@ replaces="opensonic-data>=0"
CFLAGS="-I./../loggcompat-${_loggcompat_ver}"
post_extract() {
- mv ${XBPS_BUILDDIR}/loggcompat-${_loggcompat_ver} .
+ mv opensnc-*/* .
}
pre_configure() {
From 68e73948ad9081c8b856545981e5ff335e75339f 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:14 +0700
Subject: [PATCH 09/10] solvespace: use create_wrksrc
---
srcpkgs/solvespace/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 376b78cd20be..c406f9c72c15 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -4,6 +4,7 @@ version=3.1
revision=1
_libdxfrw_hash=0b7b7b709d9299565db603f878214656ef5e9ddf
_mimalloc_hash=4e643b6d3178e0ea2a093b7e14fe621631a91e4b
+create_wrksrc=yes
build_style=cmake
hostmakedepends="pkg-config git"
makedepends="glew-devel gtkmm-devel json-c-devel gettext-devel libspnav-devel eigen"
@@ -26,10 +27,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
fi
post_extract() {
+ mv solvespace-${version}/* .
rmdir "${wrksrc}/extlib/libdxfrw"
- mv "${XBPS_BUILDDIR}/libdxfrw-${_libdxfrw_hash}" "${wrksrc}/extlib/libdxfrw"
+ mv "libdxfrw-${_libdxfrw_hash}" "${wrksrc}/extlib/libdxfrw"
rmdir "${wrksrc}/extlib/mimalloc"
- mv "${XBPS_BUILDDIR}/mimalloc-${_mimalloc_hash}" "${wrksrc}/extlib/mimalloc"
+ mv "mimalloc-${_mimalloc_hash}" "${wrksrc}/extlib/mimalloc"
}
pre_configure() {
From 22d0423fb1d9c262607be1fe49171d43221cf695 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 10/10] 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 }
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
2022-10-31 12:27 [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc sgn
` (8 preceding siblings ...)
2022-11-01 10:27 ` sgn
@ 2022-11-01 11:02 ` sgn
2022-11-01 14:37 ` sgn
` (4 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2022-11-01 11:02 UTC (permalink / raw)
To: ml
[-- 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: 12194 bytes --]
From 6c1172e1a94a50ae12ac7ab014c2bf8bce61c347 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 1/9] lilypond-doc: fix build after auto-create_wrksrc
---
srcpkgs/lilypond-doc/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/lilypond-doc/template b/srcpkgs/lilypond-doc/template
index ae03279b9230..4a5a4c3ef1eb 100644
--- a/srcpkgs/lilypond-doc/template
+++ b/srcpkgs/lilypond-doc/template
@@ -3,7 +3,6 @@ pkgname=lilypond-doc
# should be kept in sync with 'lilypond'
version=2.23.10
revision=1
-create_wrksrc=yes
short_desc="Documentation for the lilypond music engraving program"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-3.0-or-later, GFDL-1.3-or-later"
@@ -12,7 +11,7 @@ distfiles="https://gitlab.com/lilypond/lilypond/-/releases/v${version}/downloads
checksum=8927270ec2c2dff2e0984727543a467b49ff7cb3adfd98b81a15b51277bfba75
do_install() {
- vmkdir usr
- rm share/info/lilypond
- mv share ${DESTDIR}/usr/
+ vmkdir usr/share
+ rm info/lilypond
+ mv * ${DESTDIR}/usr/share
}
From 4d97f98d541a35d78e241c44ca876528570e0479 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:08 +0700
Subject: [PATCH 2/9] minisat: fix build after auto-create_wrksrc
---
srcpkgs/minisat/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/minisat/template b/srcpkgs/minisat/template
index e462c8ba34a6..374c3da51970 100644
--- a/srcpkgs/minisat/template
+++ b/srcpkgs/minisat/template
@@ -5,20 +5,21 @@ revision=2
wrksrc=minisat
build_wrksrc=simp
build_style=gnu-makefile
-make_build_args="MROOT=${XBPS_BUILDDIR}/${wrksrc} CFLAGS="-I${XBPS_BUILDDIR}/${wrksrc}" r"
makedepends="zlib-devel"
archs="i686 x86_64"
short_desc="A minimalistic and high-performance SAT solver"
maintainer="Tai Chi Minh Ralph Eastwood <tcmreastwood@gmail.com>"
license="MIT"
homepage="http://minisat.se/MiniSat.html"
-distfiles="http://minisat.se/downloads/minisat-2.2.0.tar.gz"
+distfiles="http://minisat.se/downloads/minisat-${version}.tar.gz"
checksum=92957d851cdc3baddfe07b5fc80ed5a0237c489d0c52ae72f62844b3b46d7808
-do_install() {
- vbin minisat_release minisat
+do_build() {
+ CFLAGS+=" -I${wrksrc}"
+ make ${makejobs} MROOT=${wrksrc} r
}
-post_install() {
+do_install() {
+ vbin minisat_release minisat
vlicense ../LICENSE
}
From 0186fecbc451446615be6c363d6e2557abcf4255 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:09 +0700
Subject: [PATCH 3/9] openjdk15-bootstrap: use create_wrksrc
---
srcpkgs/openjdk15-bootstrap/template | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index c1ce79ae2696..91340d925063 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -6,6 +6,8 @@ _java_ver="${version%%.*}"
_jdk_update="${version#*+}"
_base_version="${version%+*}"
_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+create_wrksrc=yes
+build_wrksrc=openjdk
archs="x86_64* i686* aarch64* armv7* ppc64*"
wrksrc="jdk${_java_ver}u-jdk-${version}"
build_style=gnu-configure
@@ -18,7 +20,7 @@ configure_args="--disable-warnings-as-errors
--with-libpng=system
--with-lcms=system
--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-jobs=${XBPS_ORIG_MAKEJOBS}
--with-version-pre=
@@ -70,9 +72,10 @@ if [ -n "$XBPS_DEBUG_PKGS" ]; then
fi
post_extract() {
- chmod +x configure
+ mv jdk* openjdk
+ chmod +x openjdk/configure
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- rm -r src/jdk.hotspot.agent
+ rm -r openjdk/src/jdk.hotspot.agent
fi
}
@@ -118,8 +121,3 @@ post_install() {
vlicense ASSEMBLY_EXCEPTION
vlicense LICENSE
}
-
-do_clean() {
- # clean up gtest
- rm -rf ${XBPS_BUILDDIR}/googletest-release-*
-}
From 85ce3f04b9786a76cc82c8d28133d417a374d78d 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:09 +0700
Subject: [PATCH 4/9] openjdk16-bootstrap: use create_wrksrc
---
srcpkgs/openjdk16-bootstrap/template | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 011612e0a966..e4d09511cee9 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -7,7 +7,8 @@ _jdk_update="${version#*+}"
_base_version="${version%+*}"
_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
archs="x86_64* i686* aarch64* armv7* ppc64*"
-wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
+create_wrksrc=yes
+build_wrksrc=openjdk
build_style=gnu-configure
configure_args="--disable-warnings-as-errors
--enable-unlimited-crypto
@@ -17,7 +18,7 @@ configure_args="--disable-warnings-as-errors
--with-libpng=system
--with-lcms=system
--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-jobs=${XBPS_ORIG_MAKEJOBS}
--with-version-pre=
@@ -70,9 +71,10 @@ if [ -n "$XBPS_DEBUG_PKGS" ]; then
fi
post_extract() {
- chmod +x configure
+ mv jdk* openjdk
+ chmod +x openjdk/configure
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- rm -r src/jdk.hotspot.agent
+ rm -r openjdk/src/jdk.hotspot.agent
fi
}
@@ -118,8 +120,3 @@ post_install() {
vlicense ASSEMBLY_EXCEPTION
vlicense LICENSE
}
-
-do_clean() {
- # clean up gtest
- rm -rf ${XBPS_BUILDDIR}/googletest-release-*
-}
From c762e1e6a79aa0a26ee156913c3ef5b0ba85ae1e 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:09 +0700
Subject: [PATCH 5/9] 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 694b69e63db9..53dc975a16da 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
From 26d28a1d4586cafd7615186fd45bb41dbdeff35b 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:10 +0700
Subject: [PATCH 6/9] openjdk8: use create_wrksrc
---
srcpkgs/openjdk8/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 5060224eaab8..25a93b300a92 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -13,7 +13,7 @@ _jdk_home="usr/lib/jvm/java-1.8-openjdk"
# otherwise the same as the normal one, just with aarch64 port added
_repo_ver="aarch64-shenandoah-jdk${version/b/-b}"
archs="x86_64* i686* aarch64* arm* ppc64*"
-wrksrc="jdk8u-shenandoah-aarch64-shenandoah-jdk8u${_jdk_update}-b${_jdk_build}"
+create_wrksrc=yes
build_style=gnu-configure
configure_args="
--prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
@@ -139,9 +139,10 @@ alternatives="
"
post_extract() {
+ mv jdk8u*/* .
chmod +x configure
for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do
- mv ../${subrepo}-${_repo_ver} ${subrepo}
+ mv ${subrepo}-${_repo_ver} ${subrepo}
done
# gcc complains about the signed shift left
From 073ad5018c6dafb0c9531ede0d82d41f02b1d115 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:10 +0700
Subject: [PATCH 7/9] openjdk9-bootstrap: use create_wrksrc
---
srcpkgs/openjdk9-bootstrap/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index 7fecb035d89e..d42b6ea3874a 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -5,7 +5,7 @@ version=9.0.4p12
revision=3
_repo_ver=${version/p/+}
archs="x86_64* i686* aarch64* arm* ppc64*"
-wrksrc="jdk9u-jdk-${_repo_ver}"
+create_wrksrc=yes
build_style=gnu-configure
configure_args="
--prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -78,9 +78,10 @@ fi
export CCACHE_DISABLE=1
post_extract() {
+ mv jdk9u*/* .
chmod +x configure
for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do
- mv ../${subrepo}-jdk-${_repo_ver} ${subrepo}
+ mv ${subrepo}-jdk-${_repo_ver} ${subrepo}
done
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From 6c95c7a9a5eb01a0263a1d581d0eddf961d4b57c 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:14 +0700
Subject: [PATCH 8/9] solvespace: use create_wrksrc
---
srcpkgs/solvespace/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 376b78cd20be..c406f9c72c15 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -4,6 +4,7 @@ version=3.1
revision=1
_libdxfrw_hash=0b7b7b709d9299565db603f878214656ef5e9ddf
_mimalloc_hash=4e643b6d3178e0ea2a093b7e14fe621631a91e4b
+create_wrksrc=yes
build_style=cmake
hostmakedepends="pkg-config git"
makedepends="glew-devel gtkmm-devel json-c-devel gettext-devel libspnav-devel eigen"
@@ -26,10 +27,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
fi
post_extract() {
+ mv solvespace-${version}/* .
rmdir "${wrksrc}/extlib/libdxfrw"
- mv "${XBPS_BUILDDIR}/libdxfrw-${_libdxfrw_hash}" "${wrksrc}/extlib/libdxfrw"
+ mv "libdxfrw-${_libdxfrw_hash}" "${wrksrc}/extlib/libdxfrw"
rmdir "${wrksrc}/extlib/mimalloc"
- mv "${XBPS_BUILDDIR}/mimalloc-${_mimalloc_hash}" "${wrksrc}/extlib/mimalloc"
+ mv "mimalloc-${_mimalloc_hash}" "${wrksrc}/extlib/mimalloc"
}
pre_configure() {
From eb34d079898081d416725c747f3676dfbd26af2e 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 9/9] 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 }
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
2022-10-31 12:27 [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc sgn
` (9 preceding siblings ...)
2022-11-01 11:02 ` sgn
@ 2022-11-01 14:37 ` sgn
2022-11-02 3:01 ` sgn
` (3 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2022-11-01 14:37 UTC (permalink / raw)
To: ml
[-- 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: 11019 bytes --]
From 132847b3d358f2a2e91eb353db43126ab07e7c2e 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:08 +0700
Subject: [PATCH 1/8] minisat: fix build after auto-create_wrksrc
---
srcpkgs/minisat/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/minisat/template b/srcpkgs/minisat/template
index e462c8ba34a6..374c3da51970 100644
--- a/srcpkgs/minisat/template
+++ b/srcpkgs/minisat/template
@@ -5,20 +5,21 @@ revision=2
wrksrc=minisat
build_wrksrc=simp
build_style=gnu-makefile
-make_build_args="MROOT=${XBPS_BUILDDIR}/${wrksrc} CFLAGS="-I${XBPS_BUILDDIR}/${wrksrc}" r"
makedepends="zlib-devel"
archs="i686 x86_64"
short_desc="A minimalistic and high-performance SAT solver"
maintainer="Tai Chi Minh Ralph Eastwood <tcmreastwood@gmail.com>"
license="MIT"
homepage="http://minisat.se/MiniSat.html"
-distfiles="http://minisat.se/downloads/minisat-2.2.0.tar.gz"
+distfiles="http://minisat.se/downloads/minisat-${version}.tar.gz"
checksum=92957d851cdc3baddfe07b5fc80ed5a0237c489d0c52ae72f62844b3b46d7808
-do_install() {
- vbin minisat_release minisat
+do_build() {
+ CFLAGS+=" -I${wrksrc}"
+ make ${makejobs} MROOT=${wrksrc} r
}
-post_install() {
+do_install() {
+ vbin minisat_release minisat
vlicense ../LICENSE
}
From 9bad34a0f7d307e7d0f4bd56444ba66d8d3b8ee4 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:09 +0700
Subject: [PATCH 2/8] openjdk15-bootstrap: use create_wrksrc
---
srcpkgs/openjdk15-bootstrap/template | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index c1ce79ae2696..91340d925063 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -6,6 +6,8 @@ _java_ver="${version%%.*}"
_jdk_update="${version#*+}"
_base_version="${version%+*}"
_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
+create_wrksrc=yes
+build_wrksrc=openjdk
archs="x86_64* i686* aarch64* armv7* ppc64*"
wrksrc="jdk${_java_ver}u-jdk-${version}"
build_style=gnu-configure
@@ -18,7 +20,7 @@ configure_args="--disable-warnings-as-errors
--with-libpng=system
--with-lcms=system
--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-jobs=${XBPS_ORIG_MAKEJOBS}
--with-version-pre=
@@ -70,9 +72,10 @@ if [ -n "$XBPS_DEBUG_PKGS" ]; then
fi
post_extract() {
- chmod +x configure
+ mv jdk* openjdk
+ chmod +x openjdk/configure
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- rm -r src/jdk.hotspot.agent
+ rm -r openjdk/src/jdk.hotspot.agent
fi
}
@@ -118,8 +121,3 @@ post_install() {
vlicense ASSEMBLY_EXCEPTION
vlicense LICENSE
}
-
-do_clean() {
- # clean up gtest
- rm -rf ${XBPS_BUILDDIR}/googletest-release-*
-}
From 813085667eecf296ed01df2d9c120496113d0fa6 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:09 +0700
Subject: [PATCH 3/8] openjdk16-bootstrap: use create_wrksrc
---
srcpkgs/openjdk16-bootstrap/template | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 011612e0a966..e4d09511cee9 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -7,7 +7,8 @@ _jdk_update="${version#*+}"
_base_version="${version%+*}"
_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
archs="x86_64* i686* aarch64* armv7* ppc64*"
-wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
+create_wrksrc=yes
+build_wrksrc=openjdk
build_style=gnu-configure
configure_args="--disable-warnings-as-errors
--enable-unlimited-crypto
@@ -17,7 +18,7 @@ configure_args="--disable-warnings-as-errors
--with-libpng=system
--with-lcms=system
--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-jobs=${XBPS_ORIG_MAKEJOBS}
--with-version-pre=
@@ -70,9 +71,10 @@ if [ -n "$XBPS_DEBUG_PKGS" ]; then
fi
post_extract() {
- chmod +x configure
+ mv jdk* openjdk
+ chmod +x openjdk/configure
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- rm -r src/jdk.hotspot.agent
+ rm -r openjdk/src/jdk.hotspot.agent
fi
}
@@ -118,8 +120,3 @@ post_install() {
vlicense ASSEMBLY_EXCEPTION
vlicense LICENSE
}
-
-do_clean() {
- # clean up gtest
- rm -rf ${XBPS_BUILDDIR}/googletest-release-*
-}
From 3e9f7ed815f7040aaa55a05fff33d13e096e5861 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:09 +0700
Subject: [PATCH 4/8] 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 694b69e63db9..53dc975a16da 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
From 3d7df68829dbcd99d00f3840ef5e200ab5586321 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:10 +0700
Subject: [PATCH 5/8] openjdk8: use create_wrksrc
---
srcpkgs/openjdk8/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 5060224eaab8..25a93b300a92 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -13,7 +13,7 @@ _jdk_home="usr/lib/jvm/java-1.8-openjdk"
# otherwise the same as the normal one, just with aarch64 port added
_repo_ver="aarch64-shenandoah-jdk${version/b/-b}"
archs="x86_64* i686* aarch64* arm* ppc64*"
-wrksrc="jdk8u-shenandoah-aarch64-shenandoah-jdk8u${_jdk_update}-b${_jdk_build}"
+create_wrksrc=yes
build_style=gnu-configure
configure_args="
--prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
@@ -139,9 +139,10 @@ alternatives="
"
post_extract() {
+ mv jdk8u*/* .
chmod +x configure
for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do
- mv ../${subrepo}-${_repo_ver} ${subrepo}
+ mv ${subrepo}-${_repo_ver} ${subrepo}
done
# gcc complains about the signed shift left
From e2c59b2c27b9ccf3ec28c395b21fc82c10e4d025 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:10 +0700
Subject: [PATCH 6/8] openjdk9-bootstrap: use create_wrksrc
---
srcpkgs/openjdk9-bootstrap/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index 7fecb035d89e..d42b6ea3874a 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -5,7 +5,7 @@ version=9.0.4p12
revision=3
_repo_ver=${version/p/+}
archs="x86_64* i686* aarch64* arm* ppc64*"
-wrksrc="jdk9u-jdk-${_repo_ver}"
+create_wrksrc=yes
build_style=gnu-configure
configure_args="
--prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -78,9 +78,10 @@ fi
export CCACHE_DISABLE=1
post_extract() {
+ mv jdk9u*/* .
chmod +x configure
for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do
- mv ../${subrepo}-jdk-${_repo_ver} ${subrepo}
+ mv ${subrepo}-jdk-${_repo_ver} ${subrepo}
done
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From d3b8b7635dcbcfdbd37fed72cad754ac74bf1430 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:14 +0700
Subject: [PATCH 7/8] solvespace: use create_wrksrc
---
srcpkgs/solvespace/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 376b78cd20be..c406f9c72c15 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -4,6 +4,7 @@ version=3.1
revision=1
_libdxfrw_hash=0b7b7b709d9299565db603f878214656ef5e9ddf
_mimalloc_hash=4e643b6d3178e0ea2a093b7e14fe621631a91e4b
+create_wrksrc=yes
build_style=cmake
hostmakedepends="pkg-config git"
makedepends="glew-devel gtkmm-devel json-c-devel gettext-devel libspnav-devel eigen"
@@ -26,10 +27,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
fi
post_extract() {
+ mv solvespace-${version}/* .
rmdir "${wrksrc}/extlib/libdxfrw"
- mv "${XBPS_BUILDDIR}/libdxfrw-${_libdxfrw_hash}" "${wrksrc}/extlib/libdxfrw"
+ mv "libdxfrw-${_libdxfrw_hash}" "${wrksrc}/extlib/libdxfrw"
rmdir "${wrksrc}/extlib/mimalloc"
- mv "${XBPS_BUILDDIR}/mimalloc-${_mimalloc_hash}" "${wrksrc}/extlib/mimalloc"
+ mv "mimalloc-${_mimalloc_hash}" "${wrksrc}/extlib/mimalloc"
}
pre_configure() {
From c47561a4bdc70b3a5d1622cd336bc4705e298332 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 8/8] 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 }
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
2022-10-31 12:27 [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc sgn
` (10 preceding siblings ...)
2022-11-01 14:37 ` sgn
@ 2022-11-02 3:01 ` sgn
2022-11-02 4:29 ` sgn
` (2 subsequent siblings)
14 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2022-11-02 3:01 UTC (permalink / raw)
To: ml
[-- 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: 11095 bytes --]
From 132847b3d358f2a2e91eb353db43126ab07e7c2e 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:08 +0700
Subject: [PATCH 1/8] minisat: fix build after auto-create_wrksrc
---
srcpkgs/minisat/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/minisat/template b/srcpkgs/minisat/template
index e462c8ba34a6..374c3da51970 100644
--- a/srcpkgs/minisat/template
+++ b/srcpkgs/minisat/template
@@ -5,20 +5,21 @@ revision=2
wrksrc=minisat
build_wrksrc=simp
build_style=gnu-makefile
-make_build_args="MROOT=${XBPS_BUILDDIR}/${wrksrc} CFLAGS="-I${XBPS_BUILDDIR}/${wrksrc}" r"
makedepends="zlib-devel"
archs="i686 x86_64"
short_desc="A minimalistic and high-performance SAT solver"
maintainer="Tai Chi Minh Ralph Eastwood <tcmreastwood@gmail.com>"
license="MIT"
homepage="http://minisat.se/MiniSat.html"
-distfiles="http://minisat.se/downloads/minisat-2.2.0.tar.gz"
+distfiles="http://minisat.se/downloads/minisat-${version}.tar.gz"
checksum=92957d851cdc3baddfe07b5fc80ed5a0237c489d0c52ae72f62844b3b46d7808
-do_install() {
- vbin minisat_release minisat
+do_build() {
+ CFLAGS+=" -I${wrksrc}"
+ make ${makejobs} MROOT=${wrksrc} r
}
-post_install() {
+do_install() {
+ vbin minisat_release minisat
vlicense ../LICENSE
}
From eecf9e6d2bf9384a972f93627af55eda960d8951 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:09 +0700
Subject: [PATCH 2/8] openjdk15-bootstrap: use create_wrksrc
---
srcpkgs/openjdk15-bootstrap/template | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index c1ce79ae2696..62f2626c0d53 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -7,7 +7,8 @@ _jdk_update="${version#*+}"
_base_version="${version%+*}"
_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
archs="x86_64* i686* aarch64* armv7* ppc64*"
-wrksrc="jdk${_java_ver}u-jdk-${version}"
+create_wrksrc=yes
+build_wrksrc=openjdk
build_style=gnu-configure
configure_args="--disable-warnings-as-errors
--prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -18,7 +19,7 @@ configure_args="--disable-warnings-as-errors
--with-libpng=system
--with-lcms=system
--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-jobs=${XBPS_ORIG_MAKEJOBS}
--with-version-pre=
@@ -70,9 +71,10 @@ if [ -n "$XBPS_DEBUG_PKGS" ]; then
fi
post_extract() {
- chmod +x configure
+ mv jdk* openjdk
+ chmod +x openjdk/configure
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- rm -r src/jdk.hotspot.agent
+ rm -r openjdk/src/jdk.hotspot.agent
fi
}
@@ -118,8 +120,3 @@ post_install() {
vlicense ASSEMBLY_EXCEPTION
vlicense LICENSE
}
-
-do_clean() {
- # clean up gtest
- rm -rf ${XBPS_BUILDDIR}/googletest-release-*
-}
From 8a4ba09f8314de31e9cb2afe7d6b3faa3f2f5958 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:09 +0700
Subject: [PATCH 3/8] openjdk16-bootstrap: use create_wrksrc
---
srcpkgs/openjdk16-bootstrap/template | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 011612e0a966..e4d09511cee9 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -7,7 +7,8 @@ _jdk_update="${version#*+}"
_base_version="${version%+*}"
_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
archs="x86_64* i686* aarch64* armv7* ppc64*"
-wrksrc="jdk${_java_ver}u-jdk-${version/+/-}"
+create_wrksrc=yes
+build_wrksrc=openjdk
build_style=gnu-configure
configure_args="--disable-warnings-as-errors
--enable-unlimited-crypto
@@ -17,7 +18,7 @@ configure_args="--disable-warnings-as-errors
--with-libpng=system
--with-lcms=system
--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-jobs=${XBPS_ORIG_MAKEJOBS}
--with-version-pre=
@@ -70,9 +71,10 @@ if [ -n "$XBPS_DEBUG_PKGS" ]; then
fi
post_extract() {
- chmod +x configure
+ mv jdk* openjdk
+ chmod +x openjdk/configure
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
- rm -r src/jdk.hotspot.agent
+ rm -r openjdk/src/jdk.hotspot.agent
fi
}
@@ -118,8 +120,3 @@ post_install() {
vlicense ASSEMBLY_EXCEPTION
vlicense LICENSE
}
-
-do_clean() {
- # clean up gtest
- rm -rf ${XBPS_BUILDDIR}/googletest-release-*
-}
From 352292bd717231a1df48b9553e0e1fe028dd7819 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:09 +0700
Subject: [PATCH 4/8] 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 694b69e63db9..53dc975a16da 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
From 84f292faa6875e940c7655d10699d33a4b94bda3 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:10 +0700
Subject: [PATCH 5/8] openjdk8: use create_wrksrc
---
srcpkgs/openjdk8/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openjdk8/template b/srcpkgs/openjdk8/template
index 5060224eaab8..25a93b300a92 100644
--- a/srcpkgs/openjdk8/template
+++ b/srcpkgs/openjdk8/template
@@ -13,7 +13,7 @@ _jdk_home="usr/lib/jvm/java-1.8-openjdk"
# otherwise the same as the normal one, just with aarch64 port added
_repo_ver="aarch64-shenandoah-jdk${version/b/-b}"
archs="x86_64* i686* aarch64* arm* ppc64*"
-wrksrc="jdk8u-shenandoah-aarch64-shenandoah-jdk8u${_jdk_update}-b${_jdk_build}"
+create_wrksrc=yes
build_style=gnu-configure
configure_args="
--prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
@@ -139,9 +139,10 @@ alternatives="
"
post_extract() {
+ mv jdk8u*/* .
chmod +x configure
for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do
- mv ../${subrepo}-${_repo_ver} ${subrepo}
+ mv ${subrepo}-${_repo_ver} ${subrepo}
done
# gcc complains about the signed shift left
From 4f0d63b9bc89b5dc223f43429e844c650de0efc2 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:10 +0700
Subject: [PATCH 6/8] openjdk9-bootstrap: use create_wrksrc
---
srcpkgs/openjdk9-bootstrap/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index 7fecb035d89e..d42b6ea3874a 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -5,7 +5,7 @@ version=9.0.4p12
revision=3
_repo_ver=${version/p/+}
archs="x86_64* i686* aarch64* arm* ppc64*"
-wrksrc="jdk9u-jdk-${_repo_ver}"
+create_wrksrc=yes
build_style=gnu-configure
configure_args="
--prefix=${XBPS_DESTDIR}/${pkgname}-${version}/usr/lib
@@ -78,9 +78,10 @@ fi
export CCACHE_DISABLE=1
post_extract() {
+ mv jdk9u*/* .
chmod +x configure
for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn; do
- mv ../${subrepo}-jdk-${_repo_ver} ${subrepo}
+ mv ${subrepo}-jdk-${_repo_ver} ${subrepo}
done
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From 68b03d4f8a3ff32e73e84e879c3c3925d1bea30b 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:14 +0700
Subject: [PATCH 7/8] solvespace: use create_wrksrc
---
srcpkgs/solvespace/template | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/solvespace/template b/srcpkgs/solvespace/template
index 376b78cd20be..c406f9c72c15 100644
--- a/srcpkgs/solvespace/template
+++ b/srcpkgs/solvespace/template
@@ -4,6 +4,7 @@ version=3.1
revision=1
_libdxfrw_hash=0b7b7b709d9299565db603f878214656ef5e9ddf
_mimalloc_hash=4e643b6d3178e0ea2a093b7e14fe621631a91e4b
+create_wrksrc=yes
build_style=cmake
hostmakedepends="pkg-config git"
makedepends="glew-devel gtkmm-devel json-c-devel gettext-devel libspnav-devel eigen"
@@ -26,10 +27,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
fi
post_extract() {
+ mv solvespace-${version}/* .
rmdir "${wrksrc}/extlib/libdxfrw"
- mv "${XBPS_BUILDDIR}/libdxfrw-${_libdxfrw_hash}" "${wrksrc}/extlib/libdxfrw"
+ mv "libdxfrw-${_libdxfrw_hash}" "${wrksrc}/extlib/libdxfrw"
rmdir "${wrksrc}/extlib/mimalloc"
- mv "${XBPS_BUILDDIR}/mimalloc-${_mimalloc_hash}" "${wrksrc}/extlib/mimalloc"
+ mv "mimalloc-${_mimalloc_hash}" "${wrksrc}/extlib/mimalloc"
}
pre_configure() {
From 48b7a05fd313cce3d81fb1853dab0cd84cf94e87 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 8/8] 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 }
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
2022-10-31 12:27 [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc sgn
` (11 preceding siblings ...)
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
14 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2022-11-02 4:29 UTC (permalink / raw)
To: ml
[-- 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: 3576 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/3] 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/3] 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() {
From 931a02bf09768d2cfe71e7dab80e2175948d0fcd 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 3/3] 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 }
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
2022-10-31 12:27 [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc sgn
` (12 preceding siblings ...)
2022-11-02 4:29 ` sgn
@ 2022-11-02 5:19 ` sgn
2022-11-02 5:19 ` [PR PATCH] [Merged]: " sgn
14 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2022-11-02 5:19 UTC (permalink / raw)
To: ml
[-- 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() {
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PR PATCH] [Merged]: DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
2022-10-31 12:27 [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc sgn
` (13 preceding siblings ...)
2022-11-02 5:19 ` sgn
@ 2022-11-02 5:19 ` sgn
14 siblings, 0 replies; 16+ messages in thread
From: sgn @ 2022-11-02 5:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1170 bytes --]
There's a merged pull request on the void-packages repository
DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
https://github.com/void-linux/void-packages/pull/40244
Description:
<!-- 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
-->
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2022-11-02 5:19 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-31 12:27 [PR PATCH] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc sgn
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
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).