[PR PATCH] afl++: build with llvm18, add aarch64

[PR PATCH] afl++: build with llvm18, add aarch64

[Calandracas606]

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

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

https://github.com/Calandracas606/void-packages afl-llvm18
https://github.com/void-linux/void-packages/pull/51148

afl++: build with llvm18, add aarch64
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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, x86_64-glibc, aarch64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-afl-llvm18-51148.patch --]
[-- Type: text/x-diff, Size: 1230 bytes --]

From 0b9a59ef82126fd1d9a102ec3515f80a1a5172a1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Mon, 8 Jul 2024 09:17:48 -0400
Subject: [PATCH] afl++: build with llvm18, add aarch64

---
 srcpkgs/afl++/template | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/afl++/template b/srcpkgs/afl++/template
index 9b1dc05f81e6a9..a2f4e0ab16fe8b 100644
--- a/srcpkgs/afl++/template
+++ b/srcpkgs/afl++/template
@@ -1,12 +1,12 @@
 # Template file for 'afl++'
 pkgname=afl++
 version=4.21c
-revision=1
+revision=2
 # x86 only currently
-archs="i686* x86_64*"
+archs="i686* x86_64* aarch64*"
 build_style=gnu-makefile
 hostmakedepends="which"
-makedepends="clang gmp-devel lld llvm llvm17-devel python3-devel"
+makedepends="gmp-devel lld18 llvm18-devel python3-devel"
 short_desc="American fuzzy lop Plus Plus - a brute-force fuzzer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
@@ -15,6 +15,7 @@ distfiles="https://github.com/AFLplusplus/AFLplusplus/archive/refs/tags/v${versi
 checksum=11f7c77d37cff6e7f65ac7cc55bab7901e0c6208e845a38764394d04ed567b30
 conflicts="afl>=0"
 replaces="afl>=0"
+nocross=yes
 
 nostrip_files="small_archive.a small_exec.elf"
 

Re: [PR PATCH] [Updated] afl++: build with llvm18, add aarch64

[Calandracas606]

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

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

https://github.com/Calandracas606/void-packages afl-llvm18
https://github.com/void-linux/void-packages/pull/51148

afl++: build with llvm18, add aarch64
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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, x86_64-glibc, aarch64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-afl-llvm18-51148.patch --]
[-- Type: text/x-diff, Size: 1407 bytes --]

From f05b61e07c6e4fd5f30301f252f071b6f69c78a3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Mon, 8 Jul 2024 09:17:48 -0400
Subject: [PATCH] afl++: build with llvm18, add aarch64

---
 srcpkgs/afl++/template | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/afl++/template b/srcpkgs/afl++/template
index 9b1dc05f81e6a9..2445f24e6b87ae 100644
--- a/srcpkgs/afl++/template
+++ b/srcpkgs/afl++/template
@@ -1,12 +1,13 @@
 # Template file for 'afl++'
 pkgname=afl++
 version=4.21c
-revision=1
+revision=2
 # x86 only currently
-archs="i686* x86_64*"
+archs="i686* x86_64* aarch64*"
+build_helper="qemu"
 build_style=gnu-makefile
 hostmakedepends="which"
-makedepends="clang gmp-devel lld llvm llvm17-devel python3-devel"
+makedepends="gmp-devel lld18 llvm18-devel python3-devel"
 short_desc="American fuzzy lop Plus Plus - a brute-force fuzzer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
@@ -18,7 +19,15 @@ replaces="afl>=0"
 
 nostrip_files="small_archive.a small_exec.elf"
 
-export LLVM_CONFIG=llvm-config
+if [ "$CROSS_BUILD" ]; then
+	export LLVM_CONFIG=${XBPS_CROSS_BASE}/usr/bin/llvm-config
+else
+	export LLVM_CONFIG=llvm-config
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*) export AFL_NO_X86="YES" ;;
+esac
 
 post_install() {
 	# Test cases contain binary .../testcases/others/elf/small_exec.elf

Re: [PR REVIEW] afl++: build with llvm18, add aarch64

[leahneukirchen]

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

New review comment by leahneukirchen on void-packages repository

https://github.com/void-linux/void-packages/pull/51148#discussion_r1668739295

Comment:
drop

Re: [PR PATCH] [Updated] afl++: build with llvm18, add aarch64

[Calandracas606]

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

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

https://github.com/Calandracas606/void-packages afl-llvm18
https://github.com/void-linux/void-packages/pull/51148

afl++: build with llvm18, add aarch64
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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, x86_64-glibc, aarch64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64 (cross + native)
  - aarch64-musl (cross + native)

@leahneukirchen 

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-afl-llvm18-51148.patch --]
[-- Type: text/x-diff, Size: 1408 bytes --]

From 865050ee3cfda3bada62257827ae854695f27a2e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Mon, 8 Jul 2024 09:17:48 -0400
Subject: [PATCH] afl++: build with llvm18, add aarch64

---
 srcpkgs/afl++/template | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/afl++/template b/srcpkgs/afl++/template
index 9b1dc05f81e6a9..c92bd1bd7682c5 100644
--- a/srcpkgs/afl++/template
+++ b/srcpkgs/afl++/template
@@ -1,12 +1,12 @@
 # Template file for 'afl++'
 pkgname=afl++
 version=4.21c
-revision=1
-# x86 only currently
-archs="i686* x86_64*"
+revision=2
+archs="i686* x86_64* aarch64*"
+build_helper="qemu"
 build_style=gnu-makefile
 hostmakedepends="which"
-makedepends="clang gmp-devel lld llvm llvm17-devel python3-devel"
+makedepends="gmp-devel lld18 llvm18-devel python3-devel"
 short_desc="American fuzzy lop Plus Plus - a brute-force fuzzer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"
@@ -18,7 +18,15 @@ replaces="afl>=0"
 
 nostrip_files="small_archive.a small_exec.elf"
 
-export LLVM_CONFIG=llvm-config
+if [ "$CROSS_BUILD" ]; then
+	export LLVM_CONFIG=${XBPS_CROSS_BASE}/usr/bin/llvm-config
+else
+	export LLVM_CONFIG=llvm-config
+fi
+
+case "$XBPS_TARGET_MACHINE" in
+	aarch64*) export AFL_NO_X86="YES" ;;
+esac
 
 post_install() {
 	# Test cases contain binary .../testcases/others/elf/small_exec.elf

Re: [PR PATCH] [Merged]: afl++: build with llvm18, add aarch64

[leahneukirchen]

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

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

afl++: build with llvm18, add aarch64
https://github.com/void-linux/void-packages/pull/51148

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### 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, x86_64-glibc, aarch64-musl
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686
  - aarch64 (cross + native)
  - aarch64-musl (cross + native)

@leahneukirchen