Utilize the new "all" ARCHITECTURES keyword in most recipes. (#6189)

x86_64 is used as a baseline: the "x86_64" entry, whatever status it has, is transformed into "all", and then the other entries in ARCHITECTURES either dropped or rearranged appropriately.
2026-04-09 05:10:05 +02:00 · 2021-09-15 15:40:18 -04:00
parent 091aa2623d
commit 4f180bdb94
2509 changed files with 2619 additions and 2619 deletions
--- a/dev-embedded/arduino/arduino-1.7.11.recipe
+++ b/dev-embedded/arduino/arduino-1.7.11.recipe
@@ -28,7 +28,7 @@ ADDITIONAL_FILES="
 	arduino-bin.rdef.in
 	"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 DISABLE_SOURCE_PACKAGE="yes"

@@ -217,7 +217,7 @@ EOF
 		-e "s|@MIDDLE@|$MIDDLE|" \
 		-e "s|@MINOR@|$MINOR|" \
 		-e "s|@LONG_INFO@|$LONG_INFO|" \
-		$portDir/additional-files/arduino-bin.rdef.in > arduino-bin.rdef	
+		$portDir/additional-files/arduino-bin.rdef.in > arduino-bin.rdef
 	addResourcesToBinaries arduino-bin.rdef $libDir/openjdk8/jre/bin/Arduino
 	mimeset -f $libDir/openjdk8/jre/bin/Arduino

--- a/dev-embedded/avra/avra-1.3.0.recipe
+++ b/dev-embedded/avra/avra-1.3.0.recipe
@@ -9,7 +9,7 @@ REVISION="3"
 SOURCE_URI="https://downloads.sourceforge.net/avra/avra-$portVersion.tar.bz2"
 CHECKSUM_SHA256="a62cbf8662caf9cc4e75da6c634efce402778639202a65eb2d149002c1049712"

-ARCHITECTURES="x86_gcc2 x86 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	avra = $portVersion
--- a/dev-embedded/avrdude/avrdude-6.3.recipe
+++ b/dev-embedded/avrdude/avrdude-6.3.recipe
@@ -10,7 +10,7 @@ SOURCE_URI="http://download.savannah.gnu.org/releases/avrdude/avrdude-$portVersi
 CHECKSUM_SHA256="0f9f731b6394ca7795b88359689a7fa1fba818c6e1d962513eb28da670e0a196"
 PATCHES="avrdude-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 commandSuffix=$secondaryArchSuffix
--- a/dev-embedded/dasmxx/dasmxx-0.1.202108.recipe
+++ b/dev-embedded/dasmxx/dasmxx-0.1.202108.recipe
@@ -30,7 +30,7 @@ SOURCE_DIR="dasmxx-7fa35130586e42f27be5015faa13763c7b85a5d1/src"
 CHECKSUM_SHA256="52cabc63b13b27d0f090d5d4a7789d8738044a8f24fc09606cbfca160449f51c"
 REVISION="1"

-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe
+++ b/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe
@@ -20,7 +20,7 @@ CHECKSUM_SHA256="0120966a424dd98124962055750e90cbd6c7b6b0fbf5b187bf435daa0a24af6
 SOURCE_DIR="dfu-programmer-$portVersion"
 PATCHES="dfu-programmer-$portVersion.patch"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/dev-embedded/ec2drv/ec2drv-20180812.recipe
+++ b/dev-embedded/ec2drv/ec2drv-20180812.recipe
@@ -12,7 +12,7 @@ SOURCE_FILENAME="ec2-new-$portVersion-$srcGitRev.tar.gz"
 SOURCE_DIR="ec2-new-$srcGitRev"
 PATCHES="ec2drv-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 commandSuffix=$secondaryArchSuffix
--- a/dev-embedded/gputils/gputils-1.5.0.recipe
+++ b/dev-embedded/gputils/gputils-1.5.0.recipe
@@ -10,7 +10,7 @@ SOURCE_URI="https://sourceforge.net/projects/gputils/files/gputils/$portVersion/
 CHECKSUM_SHA256="6f88a018e85717b57a22f27a0ca41b2157633a82351f7755be92e2d7dc40bb14"
 PATCHES="gputils-$portVersion.patchset"

-ARCHITECTURES="x86_gcc2 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	gputils = $portVersion
--- a/dev-embedded/hideur_maikeur/hideur_maikeur-2.0.recipe
+++ b/dev-embedded/hideur_maikeur/hideur_maikeur-2.0.recipe
@@ -20,7 +20,7 @@ CHECKSUM_SHA256="02179640137ee5edeee52688e5f8c45f77f69cda20c1184af3d1ec2a12d35cc
 SOURCE_DIR="hideur_maikeur-1c4b0c4c08769eef189d819ca5ed01c369774d82"
 REVISION="1"

-ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all x86_gcc2"

 PROVIDES="
 	hideur_maikeur = $portVersion
--- a/dev-embedded/libftdi/libftdi-1.5.recipe
+++ b/dev-embedded/libftdi/libftdi-1.5.recipe
@@ -14,7 +14,7 @@ CHECKSUM_SHA256="7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb04
 SOURCE_DIR="libftdi1-$portVersion"
 PATCHES="libftdi-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 libVersion="2.5.0"
--- a/dev-embedded/lm4tools/lm4tools-0.1.3.recipe
+++ b/dev-embedded/lm4tools/lm4tools-0.1.3.recipe
@@ -11,7 +11,7 @@ SOURCE_URI="https://github.com/utzig/lm4tools/archive/1cfd813779b9eb717b15b0a181
 CHECKSUM_SHA256="cd28b701384f00affe6aad2f3addcd54ca167737004c4f8926304627816c42d6"
 SOURCE_DIR="lm4tools-1cfd813779b9eb717b15b0a1814bde8338899ff9"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/dev-embedded/naken_asm/naken_asm-2021.04.18.recipe
+++ b/dev-embedded/naken_asm/naken_asm-2021.04.18.recipe
@@ -12,7 +12,7 @@ CHECKSUM_SHA256="307969c9f366fd22fc89a892e3e57f955f5fcc380a7775e0ae8b0795bb394df
 SOURCE_DIR="naken_asm-2021-04-18"
 REVISION="1"

-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/dev-embedded/sdcc/sdcc-4.0.0.recipe
+++ b/dev-embedded/sdcc/sdcc-4.0.0.recipe
@@ -14,7 +14,7 @@ SOURCE_URI="http://sourceforge.net/projects/sdcc/files/sdcc/$portVersion/sdcc-sr
 CHECKSUM_SHA256="489180806fc20a3911ba4cf5ccaf1875b68910d7aed3f401bbd0695b0bef4e10"
 PATCHES="sdcc-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 x86 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
@@ -136,7 +136,7 @@ BUILD()
 		--enable-pdk15-port \
 		--enable-pdk16-port \
 		--disable-doc \
-		--without-ccache		
+		--without-ccache
 	make $jobArgs
 	popd
 }
--- a/dev-embedded/stlink/stlink-1.6.1.recipe
+++ b/dev-embedded/stlink/stlink-1.6.1.recipe
@@ -10,7 +10,7 @@ SOURCE_URI="https://github.com/texane/stlink/archive/v$portVersion.tar.gz"
 CHECKSUM_SHA256="ca9a640f84c3e2c9873bd51759594bc05c00cdf6e1f21b434ae2c0e7985433d8"
 PATCHES="stlink-$portVersion.patchset"

-ARCHITECTURES="!x86_gcc2 x86_64"
+ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 commandSuffix=$secondaryArchSuffix
@@ -48,7 +48,7 @@ BUILD()
 {
 	mkdir -p build
 	cd build
-	
+
 	cmake .. -DCMAKE_BUILD_TYPE=Release
 	make $jobArgs
 }
--- a/dev-embedded/teensy_loader_cli/teensy_loader_cli-2.1.202108.recipe
+++ b/dev-embedded/teensy_loader_cli/teensy_loader_cli-2.1.202108.recipe
@@ -8,7 +8,7 @@ CHECKSUM_SHA256="e4a20275102f311eea3138ff28dc6166f5ea4b9801cb7dd8dbd9ac7be5c0443
 SOURCE_DIR="teensy_loader_cli-9dbbfa3b367b6c37e91e8a42dae3c6edfceccc4d"
 REVISION="1"

-ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64"
+ARCHITECTURES="?all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe
+++ b/dev-embedded/u_boot_tools/u_boot_tools-2012.10.recipe
@@ -10,7 +10,7 @@ CHECKSUM_SHA256="dddec75070b5faa5df463085e3e1d27c6d058ec3481c666917baa961956d4d1
 SOURCE_DIR="u-boot-$portVersion"
 PATCHES="u_boot_tools-$portVersion.patchset"

-ARCHITECTURES="x86_gcc2 x86_64"
+ARCHITECTURES="all"

 PROVIDES="
 	u_boot_tools = $portVersion