Rewrite ARCHITECTURES syntax to new HaikuPorter changes.

HaikuPorter now does not care what is in ARCHITECTURES when building for a SECONDARY_ARCHITECTURE.
2026-04-23 12:10:06 +02:00 · 2015-08-04 11:59:44 -04:00
parent 23faff5dbc
commit 55dd9cf19d
304 changed files with 377 additions and 1991 deletions
--- a/dev-embedded/arduino/arduino-1.0.6.recipe
+++ b/dev-embedded/arduino/arduino-1.0.6.recipe
@@ -11,12 +11,7 @@ SOURCE_URI="http://downloads.arduino.cc/arduino-1.0.6-linux32.tgz"
 CHECKSUM_SHA256="f059a572231abafb92099a3a404c0a41502c3413668610676c40029384edc658"
 REVISION="1"

-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"

 PATCHES="arduino_x86-1.0.6.patchset"
@@ -40,7 +35,7 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:gcc
-	cmd:make	
+	cmd:make
 	"

 SOURCE_DIR="arduino-1.0.6"
@@ -55,7 +50,7 @@ INSTALL()
 {
 	arduinoDir=$appsDir/Arduino
 	mkdir -p $arduinoDir
-	
+
 	cp -r examples $arduinoDir
 	cp -r libraries $arduinoDir
 	cp -r reference $arduinoDir
@@ -64,14 +59,14 @@ INSTALL()
 	rm $arduinoDir/lib/RXTXcomm.jar
 	rm $arduinoDir/lib/librxtxSerial.so
 	rm $arduinoDir/lib/librxtxSerial64.so
-	
+
 	mkdir -p $arduinoDir/hardware
 	cp -r hardware/arduino $arduinoDir/hardware
-	
+
 	mkdir -p $arduinoDir/hardware/tools
 	cp hardware/tools/avrdude.conf $arduinoDir/hardware/tools
 	ln -s /bin/x86/avrdude $arduinoDir/hardware/tools/avrdude
-	
+
 	mkdir -p $arduinoDir/hardware/tools/avr
 	ln -s /bin/x86 $arduinoDir/hardware/tools/avr/bin
 	mkdir -p $arduinoDir/hardware/tools/avr/bin.gcc
@@ -80,7 +75,7 @@ INSTALL()
 	ln -s /bin/x86/avr-gcc $arduinoDir/hardware/tools/avr/bin.gcc/avr-gcc
 	mkdir -p $arduinoDir/hardware/tools/avr/etc
 	ln -s /system/settings/avrdude.conf $arduinoDir/hardware/tools/avr/etc/avrdude.conf
-	
+
 	echo '#!/bin/sh
 APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
 cd "$APPDIR"
@@ -98,11 +93,11 @@ export LD_LIBRARY_PATH
 export PATH="${APPDIR}/java/bin:${PATH}"
 java processing.app.Base "$@"
 ' > $arduinoDir/arduino.sh
-	
+
 	chmod +x $arduinoDir/arduino.sh
-		
-	cp "haiku/Arduino IDE" $arduinoDir	
+
+	cp "haiku/Arduino IDE" $arduinoDir
 	cp revisions.txt $arduinoDir
-	
+
 	addAppDeskbarSymlink "$arduinoDir/Arduino IDE"
 }
--- a/dev-embedded/arduino/arduino-1.7.4.recipe
+++ b/dev-embedded/arduino/arduino-1.7.4.recipe
@@ -1,5 +1,5 @@
 SUMMARY="IDE for the Arduino embedded hardware family"
-DESCRIPTION="Arduino is an open-source tool used for building electronics projects. 
+DESCRIPTION="Arduino is an open-source tool used for building electronics projects.
 Arduino consists of a physical programmable circuit board (often referred to as a micro-controller) \
 and a development environment, or IDE (Integrated Development Environment) that runs on your computer, \
 used to write and upload computer code to the board."
@@ -16,12 +16,7 @@ SOURCE_URI_4="svn+https://github.com/arduino-org/Arduino/trunk/arduino-core/src/

 REVISION="1"

-ARCHITECTURES="x86 ?x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-    ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-    ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"

 PATCHES="arduino-1.7.4.patchset"
@@ -94,7 +89,7 @@ BUILD()

 	javac -encoding ISO-8859-1 -cp ./jssc-2.8.0.jar:$sourceDir/lib/arduino-core.jar \
 		$sourceDir2/build/processing/app/SerialPortList.java
-	rm $sourceDir2/build/processing/app/SerialPortList.java	
+	rm $sourceDir2/build/processing/app/SerialPortList.java

 	cd $sourceDir
 	javac -encoding ISO-8859-1 -cp java/lib/rt.jar:java/lib/tools.jar:./lib/pde.jar:./lib/arduino-core.jar \
@@ -115,7 +110,7 @@ INSTALL()
 {
 	arduinoDir=$appsDir/Arduino
 	mkdir -p $arduinoDir
-	
+
 	cp -r examples $arduinoDir
 	cp -r libraries $arduinoDir
 	cp -r reference $arduinoDir
@@ -193,7 +188,7 @@ java processing.app.Base "$@"
 	chmod +x $arduinoDir/arduino.sh

 	#Copy binary launcher
-	cp "haiku/Arduino IDE" $arduinoDir	
+	cp "haiku/Arduino IDE" $arduinoDir

 	cp revisions.txt $arduinoDir

--- a/dev-embedded/avrdude/avrdude-6.0.1.recipe
+++ b/dev-embedded/avrdude/avrdude-6.0.1.recipe
@@ -10,12 +10,7 @@ SOURCE_URI="http://download.savannah.gnu.org/releases/avrdude/avrdude-6.0.1.tar.
 CHECKSUM_SHA256="c6804668dfa96b23185dfe2e8239089af4e4ae0b11aa7435bebb28c3260ede41"
 PATCHES="avrdude-6.0.1.patch"

-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"

 GLOBAL_WRITABLE_FILES="
--- a/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe
+++ b/dev-embedded/dfu-programmer/dfu_programmer-0.6.2.recipe
@@ -20,12 +20,7 @@ SOURCE_DIR="dfu-programmer-0.6.2"
 CHECKSUM_SHA256="0120966a424dd98124962055750e90cbd6c7b6b0fbf5b187bf435daa0a24af65"
 PATCHES="dfu-programmer-0.6.2.patch"

-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/dev-embedded/gcc6809/gcc6809-4.6.1.recipe
+++ b/dev-embedded/gcc6809/gcc6809-4.6.1.recipe
@@ -12,12 +12,7 @@ LICENSE="
 	"
 PATCHES="gcc6809-$portVersion.patchset"

-ARCHITECTURES=""
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/dev-embedded/lm4tools/lm4tools-0.1.3.recipe
+++ b/dev-embedded/lm4tools/lm4tools-0.1.3.recipe
@@ -6,12 +6,7 @@ HOMEPAGE="https://github.com/utzig/lm4tools"
 LICENSE="GNU GPL v2"
 REVISION="1"

-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"

 SOURCE_URI="git+https://github.com/utzig/lm4tools.git#1cfd813779b9eb717b15b0a1814bde8338899ff9"
--- a/dev-embedded/lwtools/lwtools-4.10.recipe
+++ b/dev-embedded/lwtools/lwtools-4.10.recipe
@@ -11,12 +11,7 @@ REVISION="2"
 COPYRIGHT="2006-2014 William Astle"
 LICENSE="GNU GPL v3"

-ARCHITECTURES=""
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/dev-embedded/sdcc/sdcc-3.4.0.recipe
+++ b/dev-embedded/sdcc/sdcc-3.4.0.recipe
@@ -18,12 +18,7 @@ COPYRIGHT="
 SOURCE_URI="http://sourceforge.net/projects/sdcc/files/sdcc/3.4.0/sdcc-src-3.4.0.tar.bz2"
 CHECKSUM_SHA256="cf6af862b94d5f259f11afa0a1b86304f3047b3723a9df96f20dba869deb5bf9"
 REVISION="1"
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/dev-embedded/sdcc/sdcc-3.5.0.recipe
+++ b/dev-embedded/sdcc/sdcc-3.5.0.recipe
@@ -17,12 +17,7 @@ COPYRIGHT="
 SOURCE_URI="http://sourceforge.net/projects/sdcc/files/sdcc/$portVersion/sdcc-src-$portVersion.tar.bz2"
 CHECKSUM_SHA256="f82978d1614244b22e093402c0a4de1f688a07c807b2980126c964eb3df85fa9"
 REVISION="1"
-ARCHITECTURES="x86 x86_64"
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
--- a/dev-embedded/stlink/stlink-1.0.0.recipe
+++ b/dev-embedded/stlink/stlink-1.0.0.recipe
@@ -8,12 +8,7 @@ LICENSE="BSD (3-clause)"
 COPYRIGHT="2011 The Capt'ns Missing Link Authors"
 REVISION="1"

-ARCHITECTURES=""
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

 SOURCE_URI="https://github.com/texane/stlink/archive/1.0.0.tar.gz"
--- a/dev-embedded/stm32flash/stm32flash-0.3.recipe
+++ b/dev-embedded/stm32flash/stm32flash-0.3.recipe
@@ -15,12 +15,7 @@ ST serial bootloader.
 "
 HOMEPAGE="http://code.google.com/p/stm32flash/"
 REVISION="1"
-ARCHITECTURES=""
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-fi
+ARCHITECTURES="!x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 COPYRIGHT="
 	Geoffrey McRae