From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 29 Aug 2023 15:57:13 +0000 (+0000)
Subject: *: Change how we define build architectures
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=84587bfeed67a811f2546a0c19e02991b56af26c;p=ipfire-3.x.git

*: Change how we define build architectures

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/grub/grub.nm b/grub/grub.nm
index e5ad722d0..e5ea727b4 100644
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -7,9 +7,6 @@ name       = grub
 version    = 2.06
 release    = 1.1
 
-sup_arches = aarch64 x86_64
-thisapp    = %{name}-%{version}
-
 groups     = System/Boot
 url        = https://www.gnu.org/software/grub/
 license    = GPLv3
@@ -26,6 +23,8 @@ source_dl  = https://ftp.gnu.org/gnu/grub/
 sources    = %{thisapp}.tar.xz
 
 build
+	arches = aarch64 x86_64
+
 	requires
 		autoconf
 		automake
diff --git a/hyperscan/hyperscan.nm b/hyperscan/hyperscan.nm
index a0a437e65..793a5729f 100644
--- a/hyperscan/hyperscan.nm
+++ b/hyperscan/hyperscan.nm
@@ -7,9 +7,6 @@ name       = hyperscan
 version    = 5.4.0
 release    = 1.1
 
-# This won't build on any architectures but those
-sup_arches = x86_64
-
 groups     = System/Libraries
 url        = https://github.com/intel/hyperscan
 license    = BSD
@@ -29,6 +26,9 @@ end
 source_dl  = https://github.com/intel/hyperscan/archive/v%{version}.tar.gz#/
 
 build
+	# This package only supports x86_64
+	arches = x86_64
+
 	requires
 		boost-devel >= 1.57
 		cmake
diff --git a/memtest86+/memtest86+.nm b/memtest86+/memtest86+.nm
index d62137d83..37ccce8d4 100644
--- a/memtest86+/memtest86+.nm
+++ b/memtest86+/memtest86+.nm
@@ -7,7 +7,6 @@ name       = memtest86+
 version    = 6.10
 release    = 1
 thisapp    = memtest86plus-%{version}
-sup_arches = x86_64
 
 groups     = System/Base
 url        = http://www.memtest.org/
@@ -25,6 +24,8 @@ source_dl  = https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v%
 sources    = %{thisapp}.tar.gz
 
 build
+	arches = x86_64
+
 	requires
 		dosfstools
 	end