Arduino: bump version

dev-embedded/arduino/arduino-1.7.4.recipe

@@ -14,15 +14,15 @@ SOURCE_URI_2="git+https://github.com/scream3r/java-simple-serial-connector#f5564
 SOURCE_URI_3="svn+https://github.com/arduino-org/Arduino/trunk/app/src/processing/app"
 SOURCE_URI_4="svn+https://github.com/arduino-org/Arduino/trunk/arduino-core/src/processing"
 
-REVISION="1"
+REVISION="2"
 
 ARCHITECTURES="!x86_gcc2 x86 ?x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
-PATCHES="arduino-1.7.4.patchset"
+PATCHES="arduino-1.7.x.patchset"
 PATCHES_2="jssc_2.8.0.patchset"
-PATCHES_3="JFileChooser-1.7.4.patchset"
-PATCHES_4="SettingsFolder-1.7.4.patchset"
+PATCHES_3="JFileChooser-1.7.x.patchset"
+PATCHES_4="SettingsFolder-1.7.x.patchset"
 
 PROVIDES="
 	arduino$secondaryArchSuffix = $portVersion
@@ -42,7 +42,7 @@ BUILD_REQUIRES="
 	openjdk$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:java
 	cmd:java_config
@@ -67,12 +67,19 @@ BUILD()
 	mkdir -p $sourceDir2/build/libs/haiku
 	cd $sourceDir2/build/libs/haiku
 
+	if [ "$effectiveTargetArchitecture" = "x86_gcc2" ]; then
+		STDLIB="stdc++.r4"
+	else
+		STDLIB="stdc++"
+	fi
+
 	gcc -shared \
 		-I/boot/system/lib/openjdk/include \
 		-I/boot/system/lib/x86/openjdk/include \
 		-I/boot/system/lib/openjdk/include/haiku \
 		-I/boot/system/lib/x86/openjdk/include/haiku \
 		$sourceDir2/src/cpp/_nix_based/jssc.cpp \
+		-l$STDLIB \
 		-o $sourceDir2/build/libs/haiku/libjSSC-2.8_x86.so
 
 	cp -r $sourceDir2/src/java/libs/* $sourceDir2/build/libs