haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-03 13:38:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

ocp: prerequire pkg_config*

Browse Source 
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.
This commit is contained in:
François Revol
2013-12-11 09:43:49 +01:00
parent 451d3654ee
commit ef7b9215e7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media-sound/ocp/ocp-0.1.21_git.recipe
View File

@@ -12,7 +12,7 @@ COPYRIGHT="1994-2012 Niklas Beisert, Stian Skjelstad and others"
## media-libs/flac >= 1.2.1" ## media-libs/flac >= 1.2.1"
## ncurses zlib ... cf. ocp.spec ## ncurses zlib ... cf. ocp.spec
ARCHITECTURES="?x86 ?x86_64" ARCHITECTURES="x86 ?x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building # x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture. # for a different secondary architecture.
@@ -20,7 +20,7 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
else else
ARCHITECTURES="$ARCHITECTURES !x86_gcc2" ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
fi fi
SECONDARY_ARCHITECTURES="?x86" SECONDARY_ARCHITECTURES="x86"
PROVIDES=" PROVIDES="
ocp$secondaryArchSuffix = $portVersion ocp$secondaryArchSuffix = $portVersion
@@ -48,6 +48,7 @@ BUILD_PREREQUIRES="
cmd:autoconf cmd:autoconf
cmd:make cmd:make
cmd:gcc$secondaryArchSuffix cmd:gcc$secondaryArchSuffix
cmd:pkg_config$secondaryArchSuffix
cmd:sdl_config$secondaryArchSuffix cmd:sdl_config$secondaryArchSuffix
" "
@@ -58,7 +59,6 @@ SOURCE_DIR="code"
BUILD() BUILD()
{ {
autoconf autoconf
export CFLAGS="$(sdl-config --cflags)"
./configure --prefix=$prefix ./configure --prefix=$prefix
make make
} }