From ef7b9215e79883769b17f359ecf17d422c991681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 11 Dec 2013 09:43:49 +0100 Subject: [PATCH] ocp: prerequire pkg_config* OCP actually uses pkg-config to detect SDL, so we require the secondary arch version of it to make sure it searches the correct pc files. Tested on x86. --- media-sound/ocp/ocp-0.1.21_git.recipe | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/media-sound/ocp/ocp-0.1.21_git.recipe b/media-sound/ocp/ocp-0.1.21_git.recipe index 09556c7fa..d6d20892a 100644 --- a/media-sound/ocp/ocp-0.1.21_git.recipe +++ b/media-sound/ocp/ocp-0.1.21_git.recipe @@ -12,7 +12,7 @@ COPYRIGHT="1994-2012 Niklas Beisert, Stian Skjelstad and others" ## media-libs/flac >= 1.2.1" ## ncurses zlib ... cf. ocp.spec -ARCHITECTURES="?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. @@ -20,7 +20,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then else ARCHITECTURES="$ARCHITECTURES !x86_gcc2" fi -SECONDARY_ARCHITECTURES="?x86" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" ocp$secondaryArchSuffix = $portVersion @@ -48,6 +48,7 @@ BUILD_PREREQUIRES=" cmd:autoconf cmd:make cmd:gcc$secondaryArchSuffix + cmd:pkg_config$secondaryArchSuffix cmd:sdl_config$secondaryArchSuffix " @@ -58,7 +59,6 @@ SOURCE_DIR="code" BUILD() { autoconf - export CFLAGS="$(sdl-config --cflags)" ./configure --prefix=$prefix make }