From 5b1695873bc253350485ca2394604c28e4f4f292 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 20 Dec 2013 02:52:45 -0800 Subject: [PATCH] Fixed openal build on x86 --- media-libs/openal/openal-1.13.0.recipe | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/media-libs/openal/openal-1.13.0.recipe b/media-libs/openal/openal-1.13.0.recipe index e6549ee6b..22422c081 100644 --- a/media-libs/openal/openal-1.13.0.recipe +++ b/media-libs/openal/openal-1.13.0.recipe @@ -21,10 +21,10 @@ REQUIRES=" " BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel >= $haikuVersion cmd:cmake cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -35,8 +35,10 @@ SOURCE_DIR="openal-soft-1.13" BUILD() { - cmake . - make + sed -i "s,RUNTIME DESTINATION bin,RUNTIME DESTINATION $relativeBinDir," CMakeLists.txt + cmake . -DCMAKE_INSTALL_PREFIX=$prefix \ + -DLIB_SUFFIX="/${secondaryArchSuffix/_/}" + make $jobArgs } INSTALL() @@ -45,9 +47,7 @@ INSTALL() mkdir -p $developDir/headers mkdir -p $binDir - mv /boot/common/lib $libDir - mv /boot/common/include/AL $developDir/headers - mv /boot/common/bin/openal-info $binDir + mv $prefix/include $developDir/headers prepareInstalledDevelLibs libopenal fixPkgconfig @@ -61,11 +61,10 @@ INSTALL() PROVIDES_devel=" openal${secondaryArchSuffix}_devel = $portVersion compat >= 1 devel:libopenal$secondaryArchSuffix = 1.13.0 compat >= 0 - cmd:openal_info + cmd:openal_info$secondaryArchSuffix " REQUIRES_devel=" haiku$secondaryArchSuffix >= $haikuVersion lib:libopenal$secondaryArchSuffix == $portVersion base " -