From 4410b9b2e262ce3e9cbbe192790c75879df9e56f Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Wed, 18 Dec 2013 18:39:31 -0800 Subject: [PATCH] fixed libflac and probably sdl_mixer on x86. --- media-libs/flac/flac-1.3.0.recipe | 12 ++++++------ media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/media-libs/flac/flac-1.3.0.recipe b/media-libs/flac/flac-1.3.0.recipe index d2d100a5e..310ba93dc 100644 --- a/media-libs/flac/flac-1.3.0.recipe +++ b/media-libs/flac/flac-1.3.0.recipe @@ -12,13 +12,14 @@ LICENSE="GNU LGPL v2.1 COPYRIGHT="2000-2007 Josh Coalson" -ARCHITECTURES="x86 x86_gcc2" +ARCHITECTURES="x86_gcc2 x86 x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" flac$secondaryArchSuffix = $portVersion compat >= 1 libFLAC$secondaryArchSuffix = 1.3.0 compat >= 1 - cmd:flac - cmd:metaflac + cmd:flac$secondaryArchSuffix + cmd:metaflac$secondaryArchSuffix lib:libFLAC++$secondaryArchSuffix lib:libFLAC$secondaryArchSuffix " @@ -30,10 +31,10 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " - + BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel cmd:nasm cmd:gcc$secondaryArchSuffix cmd:libtoolize @@ -67,7 +68,6 @@ INSTALL() # devel package packageEntries devel \ $developDir - } TEST() diff --git a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe index 61f6fb7b3..af302a881 100644 --- a/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe +++ b/media-libs/sdl_mixer/sdl_mixer-1.2.12.recipe @@ -49,10 +49,10 @@ BUILD_PREREQUIRES=" cmd:ld$secondaryArchSuffix cmd:libtool cmd:make - cmd:pkg_config - cmd:sdl_config - cmd:smpeg_config - cmd:libmikmod_config + cmd:pkg_config$secondaryArchSuffix + cmd:sdl_config$secondaryArchSuffix + cmd:smpeg_config$secondaryArchSuffix + cmd:libmikmod_config$secondaryArchSuffix " SOURCE_DIR="SDL_mixer-$portVersion"