From c2123bb6bb1d0cd0bb041f94881f1f33de5e2227 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 6 Apr 2015 12:43:55 +0200 Subject: [PATCH] Dosbox: fix build and move to $binDir * Dosbox is not only a standalone application, it is also used to run DOS executables non-interactively * There are several front-ends for it which could be put in $appsDir * In either case, things are simpler if Dosbox is in the path, it would not be if installed in home/config/apps. --- games-emulation/dosbox/dosbox-0.74.recipe | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/games-emulation/dosbox/dosbox-0.74.recipe b/games-emulation/dosbox/dosbox-0.74.recipe index 4ba02ec2e..1df40eda4 100644 --- a/games-emulation/dosbox/dosbox-0.74.recipe +++ b/games-emulation/dosbox/dosbox-0.74.recipe @@ -28,7 +28,7 @@ SECONDARY_ARCHITECTURES="x86" PROVIDES=" dosbox$secondaryArchSuffix = $portVersion - app:dosbox$secondaryArchSuffix = $portVersion + cmd:dosbox$secondaryArchSuffix = $portVersion " REQUIRES=" haiku$secondaryArchSuffix @@ -38,6 +38,9 @@ REQUIRES=" lib:libglu$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libz$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix " BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel @@ -51,6 +54,7 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" cmd:autoconf cmd:libtoolize + cmd:find cmd:make cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -64,11 +68,11 @@ PATCHES=" BUILD() { - ./configure --prefix=$prefix --disable-dynamic-core --bindir=$appsDir --datarootdir=$dataDir - make + LDFLAGS=-lnetwork runConfigure ./configure --disable-dynamic-core + make $jobArgs } INSTALL() { make install - addAppDeskbarSymlink $appsDir/dosbox "DOSBox" + addAppDeskbarSymlink $binDir/dosbox "DOSBox" }