From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] DO NOT MERGE: Check build for code cleanup for auto-create_wrksrc
Date: Wed, 02 Nov 2022 04:01:45 +0100 [thread overview]
Message-ID: <20221102030145.onluqWQwwfknGVJT7TfgUxFZv8nvXmSKOrk27uuRnOc@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40244@inbox.vuxu.org>
[-- 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 }
next prev parent reply other threads:[~2022-11-02 3:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-31 12:27 [PR PATCH] " 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 [this message]
2022-11-02 4:29 ` sgn
2022-11-02 5:19 ` sgn
2022-11-02 5:19 ` [PR PATCH] [Merged]: " sgn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221102030145.onluqWQwwfknGVJT7TfgUxFZv8nvXmSKOrk27uuRnOc@z \
--to=sgn@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).