[PR PATCH] qbe: update to 1.2.

[PR PATCH] qbe: update to 1.2.

[echoptic]

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

There is a new pull request by echoptic against master on the void-packages repository

https://github.com/echoptic/void-packages qbe-update
https://github.com/void-linux/void-packages/pull/49016

qbe: update to 1.2.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qbe-update-49016.patch --]
[-- Type: text/x-diff, Size: 1011 bytes --]

From 4ecbf194248da1ad6a446c1364eef1db8ac4ade0 Mon Sep 17 00:00:00 2001
From: echoptic <bigerchocho@gmail.com>
Date: Fri, 1 Mar 2024 09:58:13 +0100
Subject: [PATCH] qbe: update to 1.2.

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

diff --git a/srcpkgs/qbe/template b/srcpkgs/qbe/template
index e56a69ffcc107b..461f943544dfab 100644
--- a/srcpkgs/qbe/template
+++ b/srcpkgs/qbe/template
@@ -1,6 +1,6 @@
 # Template file for 'qbe'
 pkgname=qbe
-version=1.1
+version=1.2
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -9,7 +9,7 @@ maintainer="Bryce Vandegrift <bryce@brycevandegrift.xyz>"
 license="MIT"
 homepage="https://c9x.me/compile/"
 distfiles="https://c9x.me/compile/release/qbe-${version}.tar.xz"
-checksum=7d0a53dd40df48072aae317e11ddde15d1a980673160e514e235b9ecaa1db12c
+checksum=a6d50eb952525a234bf76ba151861f73b7a382ac952d985f2b9af1df5368225d
 
 # Currently only aarch64 and x86_64 targets are supported and the checks
 # test the compiled binaries.

Re: qbe: update to 1.2.

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#issuecomment-1972800664

Comment:
Partial duplicate of https://github.com/void-linux/void-packages/pull/48784

Re: qbe: update to 1.2.

[echoptic]

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

New comment by echoptic on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#issuecomment-1972851455

Comment:
Why did the CI check fail? Lint failed because there is no comment next to `make_check=no`. But what about the other 2 checks? I ran `./xbps-src -Q pkg qbe` locally and it worked. Sorry, this is my first time trying to do this.

Re: qbe: update to 1.2.

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#issuecomment-1972857075

Comment:
Cross compiling failed because it used the wrong compiler.

Re: qbe: update to 1.2.

[echoptic]

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

New comment by echoptic on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#issuecomment-1972968466

Comment:
OK, I think the problem is this in the Makefile: `CC       = cc` right?
Does adding this in the template file fix the issue?
```
do_build() {
        if [ "$CROSS_BUILD" ]; then
                make CC="${XBPS_CROSS_TRIPLET}-gcc"
        fi
}
```

Re: [PR PATCH] [Updated] qbe: update to 1.2.

[echoptic]

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

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

https://github.com/echoptic/void-packages qbe-update
https://github.com/void-linux/void-packages/pull/49016

qbe: update to 1.2.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qbe-update-49016.patch --]
[-- Type: text/x-diff, Size: 1296 bytes --]

From 4471a090de158dd7f611722e9d3c526cc5adb2ad Mon Sep 17 00:00:00 2001
From: echoptic <bigerchocho@gmail.com>
Date: Fri, 1 Mar 2024 09:58:13 +0100
Subject: [PATCH] qbe: update to 1.2.

---
 srcpkgs/qbe/template | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/qbe/template b/srcpkgs/qbe/template
index e56a69ffcc107b..48f2941f43d740 100644
--- a/srcpkgs/qbe/template
+++ b/srcpkgs/qbe/template
@@ -1,6 +1,6 @@
 # Template file for 'qbe'
 pkgname=qbe
-version=1.1
+version=1.2
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -9,15 +9,21 @@ maintainer="Bryce Vandegrift <bryce@brycevandegrift.xyz>"
 license="MIT"
 homepage="https://c9x.me/compile/"
 distfiles="https://c9x.me/compile/release/qbe-${version}.tar.xz"
-checksum=7d0a53dd40df48072aae317e11ddde15d1a980673160e514e235b9ecaa1db12c
+checksum=a6d50eb952525a234bf76ba151861f73b7a382ac952d985f2b9af1df5368225d
 
 # Currently only aarch64 and x86_64 targets are supported and the checks
 # test the compiled binaries.
 case "$XBPS_TARGET_MACHINE" in
 	aarch64*|x86_64*) ;;
-	*) make_check=no ;;
+	*) make_check=no # tests are broken ;;
 esac
 
+do_build() {
+	if [ "$CROSS_BUILD" ]; then
+		make CC="${XBPS_CROSS_TRIPLET}-gcc"
+	fi
+}
+
 post_install() {
 	vdoc doc/abi.txt
 	vdoc doc/il.txt

Re: qbe: update to 1.2.

[echoptic]

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

New comment by echoptic on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#issuecomment-1973281007

Comment:
Cross compiling to riscv64 and aarch64 works

Re: qbe: update to 1.2.

[echoptic]

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

New comment by echoptic on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#issuecomment-1973281007

Comment:
Cross compiling to riscv64 and aarch64 works and added comment for `make_check=no`

Re: qbe: update to 1.2.

[Duncaen]

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

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#issuecomment-1973542504

Comment:
Overwriting do_build will now now build the package if cross compiled.
You probably want `make_use_env=yes` instead, the `gnu-makefile` buildstyle already sets `CC`.

Re: qbe: update to 1.2.

[Duncaen]

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

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#issuecomment-1973542504

Comment:
Overwriting do_build will now now build the package if cross compiled.
You probably want `make_use_env=yes` instead, the `gnu-makefile` buildstyle already sets `CC`.

Edit: `make_use_env` is already used, so you want the opposite, but then it might not use the right cflags, you could just `vsed -e '/^CC/d' -i Makefile` in `post_patch`.

Re: qbe: update to 1.2.

[Duncaen]

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

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#issuecomment-1973542504

Comment:
Overwriting do_build will now not build the package if natively compiled.
You probably want `make_use_env=yes` instead, the `gnu-makefile` buildstyle already sets `CC`.

Edit: `make_use_env` is already used, so you want the opposite, but then it might not use the right cflags, you could just `vsed -e '/^CC/d' -i Makefile` in `post_patch`.

Re: [PR REVIEW] qbe: update to 1.2.

[Duncaen]

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

New review comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#discussion_r1509271226

Comment:
This comment is wrong, the tests don't exist for other architectures.

Re: [PR PATCH] [Updated] qbe: update to 1.2.

[echoptic]

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

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

https://github.com/echoptic/void-packages qbe-update
https://github.com/void-linux/void-packages/pull/49016

qbe: update to 1.2.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qbe-update-49016.patch --]
[-- Type: text/x-diff, Size: 1422 bytes --]

From 3e28b5ba722a69afe8a26110e758072ac40b1a58 Mon Sep 17 00:00:00 2001
From: echoptic <bigerchocho@gmail.com>
Date: Fri, 1 Mar 2024 09:58:13 +0100
Subject: [PATCH] qbe: update to 1.2.

---
 srcpkgs/qbe/template | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qbe/template b/srcpkgs/qbe/template
index e56a69ffcc107b..39e88270f6c1dd 100644
--- a/srcpkgs/qbe/template
+++ b/srcpkgs/qbe/template
@@ -1,6 +1,6 @@
 # Template file for 'qbe'
 pkgname=qbe
-version=1.1
+version=1.2
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -9,15 +9,23 @@ maintainer="Bryce Vandegrift <bryce@brycevandegrift.xyz>"
 license="MIT"
 homepage="https://c9x.me/compile/"
 distfiles="https://c9x.me/compile/release/qbe-${version}.tar.xz"
-checksum=7d0a53dd40df48072aae317e11ddde15d1a980673160e514e235b9ecaa1db12c
+checksum=a6d50eb952525a234bf76ba151861f73b7a382ac952d985f2b9af1df5368225d
 
 # Currently only aarch64 and x86_64 targets are supported and the checks
 # test the compiled binaries.
 case "$XBPS_TARGET_MACHINE" in
-	aarch64*|x86_64*) ;;
-	*) make_check=no ;;
+	x86_64*) ;;
+	aarch64*) make_check_args="TARGET=arm64" ;;
+	riscv64*) make_check_args="TARGET=rv64" ;;
+	*) make_check=no # no tests for other architectures ;;
 esac
 
+do_build() {
+	if [ "$CROSS_BUILD" ]; then
+		make CC="${XBPS_CROSS_TRIPLET}-gcc"
+	fi
+}
+
 post_install() {
 	vdoc doc/abi.txt
 	vdoc doc/il.txt

Re: [PR REVIEW] qbe: update to 1.2.

[echoptic]

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

New review comment by echoptic on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#discussion_r1509940908

Comment:
Tests exist for riscv64 and aarch64, but they can only be ran with the host qbe and I wasnt sure if it would work in the github workflow, but I tested locally and it looks like it doesnt run tests for target arch when you are cross compiling.
```
check-arm64: qbe
        TARGET=arm64 tools/test.sh all

check-rv64: qbe
        TARGET=rv64 tools/test.sh all
 ```
 I updated the template and I think its OK now.

Re: qbe: update to 1.2.

[echoptic]

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

New comment by echoptic on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#issuecomment-1974763576

Comment:
> Overwriting do_build will now not build the package if natively compiled. You probably want `make_use_env=yes` instead, the `gnu-makefile` buildstyle already sets `CC`.
> 
> Edit: `make_use_env` is already used, so you want the opposite, but then it might not use the right cflags, you could just `vsed -e '/^CC/d' -i Makefile` in `post_patch`.

Natively compiling works for me:
```
./xbps-src pkg qbe
=> xbps-src: updating repositories for host (x86_64)...
[*] Updating repository `https://repo-default.voidlinux.org/current/bootstrap/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/nonfree/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/debug/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/multilib/bootstrap/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/multilib/x86_64-repodata' ...
[*] Updating repository `https://repo-default.voidlinux.org/current/multilib/nonfree/x86_64-repodata' ...
=> xbps-src: updating software in / masterdir...
=> xbps-src: cleaning up / masterdir...
=> qbe-1.2_1: removing autodeps, please wait...
=> qbe-1.2_1: building with [gnu-makefile] for x86_64...
=> qbe-1.2_1: running do-fetch hook: 00-distfiles ...
=> qbe-1.2_1: running do-extract hook: 00-distfiles ...
=> qbe-1.2_1: extracting distfile(s), please wait...
=> qbe-1.2_1: running do-patch hook: 00-patches ...
=> qbe-1.2_1: running pre-configure hook: 00-gnu-configure-asneeded ...
=> qbe-1.2_1: running pre-configure hook: 01-override-config ...
=> qbe-1.2_1: running pre-configure hook: 02-script-wrapper ...
=> qbe-1.2_1: running pre-build hook: 02-script-wrapper ...
=> qbe-1.2_1: running do_build ...
=> qbe-1.2_1: skipping check (XBPS_CHECK_PKGS is disabled) ...
=> qbe-1.2_1: running pre-install hook: 00-libdir ...
=> qbe-1.2_1: running pre-install hook: 02-script-wrapper ...
=> qbe-1.2_1: running pre-install hook: 98-fixup-gir-path ...
=> qbe-1.2_1: running do_install ...
cc -std=c99 -g -Wall -Wextra -Wpedantic -c main.c -o main.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c util.c -o util.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c parse.c -o parse.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c abi.c -o abi.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c cfg.c -o cfg.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c mem.c -o mem.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c ssa.c -o ssa.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c alias.c -o alias.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c load.c -o load.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c copy.c -o copy.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c fold.c -o fold.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c simpl.c -o simpl.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c live.c -o live.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c spill.c -o spill.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c rega.c -o rega.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c emit.c -o emit.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c amd64/targ.c -o amd64/targ.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c amd64/sysv.c -o amd64/sysv.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c amd64/isel.c -o amd64/isel.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c amd64/emit.c -o amd64/emit.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c arm64/targ.c -o arm64/targ.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c arm64/abi.c -o arm64/abi.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c arm64/isel.c -o arm64/isel.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c arm64/emit.c -o arm64/emit.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c rv64/targ.c -o rv64/targ.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c rv64/abi.c -o rv64/abi.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c rv64/isel.c -o rv64/isel.o
cc -std=c99 -g -Wall -Wextra -Wpedantic -c rv64/emit.c -o rv64/emit.o
cc -Wl,-z,relro -Wl,-z,now -Wl,--as-needed     main.o util.o parse.o abi.o cfg.o mem.o ssa.o alias.o load.o  copy.o fold.o simpl.o live.o spill.o rega.o emit.o amd64/targ.o amd64/sysv.o amd64/isel.o amd64/emit.o arm64/targ.o arm64/abi.o arm64/isel.o arm64/emit.o rv64/targ.o rv64/abi.o rv64/isel.o rv64/emit.o -o qbe
mkdir -p "/destdir//qbe-1.2/usr/bin"
install -m755 qbe "/destdir//qbe-1.2/usr/bin/qbe"
=> qbe-1.2_1: running post_install ...
=> qbe-1.2_1: running post-install hook: 00-compress-info-files ...
=> qbe-1.2_1: running post-install hook: 00-fixup-gir-path ...
=> qbe-1.2_1: running post-install hook: 00-libdir ...
=> qbe-1.2_1: running post-install hook: 00-uncompress-manpages ...
=> qbe-1.2_1: running post-install hook: 01-remove-misc ...
=> qbe-1.2_1: running post-install hook: 02-remove-libtool-archives ...
=> qbe-1.2_1: running post-install hook: 02-remove-perl-files ...
=> qbe-1.2_1: running post-install hook: 02-remove-python-bytecode-files ...
=> qbe-1.2_1: running post-install hook: 03-remove-empty-dirs ...
=> WARNING: qbe-1.2_1: removed empty dir: /usr/lib
=> qbe-1.2_1: running post-install hook: 04-create-xbps-metadata-scripts ...
=> qbe-1.2_1: running post-install hook: 05-generate-gitrevs ...
=> qbe-1.2_1: running post-install hook: 06-strip-and-debug-pkgs ...
   Stripped position-independent executable: /usr/bin/qbe
=> qbe-1.2_1: running post-install hook: 10-pkglint-devel-paths ...
=> qbe-1.2_1: running post-install hook: 11-pkglint-elf-in-usrshare ...
=> qbe-1.2_1: running post-install hook: 12-rename-python3-c-bindings ...
=> qbe-1.2_1: running post-install hook: 13-pkg-config-clean-xbps-cross-base-ref ...
=> qbe-1.2_1: running post-install hook: 14-fix-permissions ...
=> qbe-1.2_1: running post-install hook: 80-prepare-32bit ...
=> qbe-1.2_1: running post-install hook: 98-shlib-provides ...
=> qbe-1.2_1: running post-install hook: 99-pkglint-warn-cross-cruft ...
=> qbe-1.2_1: running pre-pkg hook: 03-rewrite-python-shebang ...
=> qbe-1.2_1: running pre-pkg hook: 04-generate-runtime-deps ...
   SONAME: libc.so.6 <-> glibc>=2.38_1
=> qbe-1.2_1: running pre-pkg hook: 05-generate-32bit-runtime-deps ...
=> qbe-1.2_1: running pre-pkg hook: 90-set-timestamps ...
=> qbe-1.2_1: setting mtimes to Sat Mar  2 10:15:33 AM UTC 2024
=> qbe-1.2_1: running pre-pkg hook: 99-pkglint-subpkgs ...
=> qbe-1.2_1: running pre-pkg hook: 99-pkglint ...
=> qbe-1.2_1: running pre-pkg hook: 999-collected-rdeps ...
   glibc>=2.38_1
=> qbe-1.2_1: running do-pkg hook: 00-gen-pkg ...
=> Creating qbe-1.2_1.x86_64.xbps for repository /host/binpkgs/qbe-update ...
=> qbe-1.2_1: running post-pkg hook: 00-register-pkg ...
=> Registering new packages to /host/binpkgs/qbe-update
index: added `qbe-1.2_1' (x86_64).
index: 1 packages registered.
=> qbe-1.2_1: removing autodeps, please wait...
=> qbe-1.2_1: cleaning build directory...
=> qbe: removing files from destdir...
```

Re: qbe: update to 1.2.

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#issuecomment-1974769506

Comment:
The way you have it set up, make doesn't run in `do_build()` when native compiling.
The object files getting compiled `do_install()` is not correct as the variables set when running `do_install()` are not necessarily the same as with `do_build()`.

You don't need to use a custom `do_build()` here, there is a variable `make_build_args` for this purpose, although as Duncaen said, the correct fix is to remove the CC assignment in the makefile so that the compiler can be specified by the environment.

Re: qbe: update to 1.2.

[oreo639]

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

New comment by oreo639 on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#issuecomment-1974769506

Comment:
The way you have it set up, make doesn't run in `do_build()` when native compiling.
The object files getting compiled `do_install()` is not correct as the variables set when running `do_install()` are not necessarily the same as with `do_build()`.

You don't need to use a custom `do_build()` here, there is a variable `make_build_args` for this purpose, although as Duncaen said, the correct fix is to remove the CC assignment in the makefile using vsed so that the compiler can be specified by the environment.

Re: [PR PATCH] [Updated] qbe: update to 1.2.

[echoptic]

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

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

https://github.com/echoptic/void-packages qbe-update
https://github.com/void-linux/void-packages/pull/49016

qbe: update to 1.2.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qbe-update-49016.patch --]
[-- Type: text/x-diff, Size: 1379 bytes --]

From c84495e205bd45388d63ff08f65e0c3b407a3f0f Mon Sep 17 00:00:00 2001
From: echoptic <bigerchocho@gmail.com>
Date: Fri, 1 Mar 2024 09:58:13 +0100
Subject: [PATCH] qbe: update to 1.2.

---
 srcpkgs/qbe/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qbe/template b/srcpkgs/qbe/template
index e56a69ffcc107b..ba231cf18d06fc 100644
--- a/srcpkgs/qbe/template
+++ b/srcpkgs/qbe/template
@@ -1,6 +1,6 @@
 # Template file for 'qbe'
 pkgname=qbe
-version=1.1
+version=1.2
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -9,15 +9,21 @@ maintainer="Bryce Vandegrift <bryce@brycevandegrift.xyz>"
 license="MIT"
 homepage="https://c9x.me/compile/"
 distfiles="https://c9x.me/compile/release/qbe-${version}.tar.xz"
-checksum=7d0a53dd40df48072aae317e11ddde15d1a980673160e514e235b9ecaa1db12c
+checksum=a6d50eb952525a234bf76ba151861f73b7a382ac952d985f2b9af1df5368225d
 
 # Currently only aarch64 and x86_64 targets are supported and the checks
 # test the compiled binaries.
 case "$XBPS_TARGET_MACHINE" in
-	aarch64*|x86_64*) ;;
-	*) make_check=no ;;
+	x86_64*) ;;
+	aarch64*) make_check_args="TARGET=arm64" ;;
+	riscv64*) make_check_args="TARGET=rv64" ;;
+	*) make_check=no # no tests for other architectures ;;
 esac
 
+post_patch() {
+	vsed -e '/^CC/d' -i Makefile
+}
+
 post_install() {
 	vdoc doc/abi.txt
 	vdoc doc/il.txt

Re: qbe: update to 1.2.

[echoptic]

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

New comment by echoptic on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#issuecomment-1974774042

Comment:
Removed CC assignment in Makefile and tested for x86_64 and aarch64 glibc and it works.

Re: qbe: update to 1.2.

[echoptic]

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

New comment by echoptic on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#issuecomment-1974774042

Comment:
Removed CC assignment in Makefile using `vsed -e '/^CC/d' -i Makefile` and tested for x86_64 and aarch64 glibc and it works.

Re: qbe: update to 1.2.

[echoptic]

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

New comment by echoptic on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#issuecomment-1974774042

Comment:
Removed CC assignment in Makefile by adding `vsed -e '/^CC/d' -i Makefile` in `post_patch` and tested for x86_64 and aarch64 glibc and it works.

Re: [PR PATCH] [Updated] qbe: update to 1.2.

[echoptic]

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

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

https://github.com/echoptic/void-packages qbe-update
https://github.com/void-linux/void-packages/pull/49016

qbe: update to 1.2.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-qbe-update-49016.patch --]
[-- Type: text/x-diff, Size: 1464 bytes --]

From 0bac3d8f9267785addd24979b2e2f707a05c4b02 Mon Sep 17 00:00:00 2001
From: echoptic <bigerchocho@gmail.com>
Date: Fri, 1 Mar 2024 09:58:13 +0100
Subject: [PATCH] qbe: update to 1.2.

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

diff --git a/srcpkgs/qbe/template b/srcpkgs/qbe/template
index e56a69ffcc107b..2523c7e81320a4 100644
--- a/srcpkgs/qbe/template
+++ b/srcpkgs/qbe/template
@@ -1,6 +1,6 @@
 # Template file for 'qbe'
 pkgname=qbe
-version=1.1
+version=1.2
 revision=1
 build_style=gnu-makefile
 make_use_env=yes
@@ -9,15 +9,21 @@ maintainer="Bryce Vandegrift <bryce@brycevandegrift.xyz>"
 license="MIT"
 homepage="https://c9x.me/compile/"
 distfiles="https://c9x.me/compile/release/qbe-${version}.tar.xz"
-checksum=7d0a53dd40df48072aae317e11ddde15d1a980673160e514e235b9ecaa1db12c
+checksum=a6d50eb952525a234bf76ba151861f73b7a382ac952d985f2b9af1df5368225d
 
-# Currently only aarch64 and x86_64 targets are supported and the checks
+# Currently only riscv64, aarch64 and x86_64 targets are supported and the checks
 # test the compiled binaries.
 case "$XBPS_TARGET_MACHINE" in
-	aarch64*|x86_64*) ;;
-	*) make_check=no ;;
+	x86_64*) ;;
+	aarch64*) make_check_args="TARGET=arm64" ;;
+	riscv64*) make_check_args="TARGET=rv64" ;;
+	*) make_check=no # no tests for other architectures ;;
 esac
 
+post_patch() {
+	vsed -e '/^CC/d' -i Makefile
+}
+
 post_install() {
 	vdoc doc/abi.txt
 	vdoc doc/il.txt

Re: qbe: update to 1.2.

[echoptic]

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

New comment by echoptic on void-packages repository

https://github.com/void-linux/void-packages/pull/49016#issuecomment-1984410816

Comment:
Hi just checking, is there anything else I need to do? Or just have to wait for someone to merge this?

Re: [PR PATCH] [Merged]: qbe: update to 1.2.

[cinerea0]

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

There's a merged pull request on the void-packages repository

qbe: update to 1.2.
https://github.com/void-linux/void-packages/pull/49016

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc