From 48429085c22e6de289456755293ad67725f8425b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adri=C3=A1n=20Arroyo=20Calle?= Date: Wed, 11 Dec 2013 20:04:25 +0000 Subject: [PATCH] sdl_net, sdl_sound and gcc2 --- games-emulation/dosbox/dosbox-0.74.recipe | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/games-emulation/dosbox/dosbox-0.74.recipe b/games-emulation/dosbox/dosbox-0.74.recipe index bfb0e7adc..796053362 100644 --- a/games-emulation/dosbox/dosbox-0.74.recipe +++ b/games-emulation/dosbox/dosbox-0.74.recipe @@ -20,8 +20,13 @@ REVISION="1" LICENSE="GNU GPL v2" COPYRIGHT="2002-2013 The DosBox Team" -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="!x86_gcc2 x86 x86_64" +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 +SECONDARY_ARCHITECTURES="x86 x86_64" PROVIDES=" dosbox$secondaryArchSuffix = $portVersion @@ -30,6 +35,8 @@ PROVIDES=" REQUIRES=" haiku$secondaryArchSuffix >= $haikuVersion lib:libsdl$secondaryArchSuffix + lib:sdl_net$secondaryArchSuffix + lib:sdl_sound$secondaryArchSuffix lib:libglu$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -39,6 +46,8 @@ BUILD_REQUIRES=" devel:libglu$secondaryArchSuffix devel:libpng$secondaryArchSuffix devel:libz$secondaryArchSuffix + devel:sdl_net$secondaryArchSuffix + devel:sdl_sound$secondaryArchSuffix libsdl${secondaryArchSuffix}_devel " BUILD_PREREQUIRES="