From e85bd25b297635e813608bc04c35d9c2cfb28c42 Mon Sep 17 00:00:00 2001 From: diversys Date: Thu, 5 Jun 2014 10:20:34 +0000 Subject: [PATCH 1/2] Dockbert: fix missing $secondaryArchSuffix --- haiku-apps/dockbert/dockbert-1.0.2b1.recipe | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe index 6530c7d16..bf9f0a865 100644 --- a/haiku-apps/dockbert/dockbert-1.0.2b1.recipe +++ b/haiku-apps/dockbert/dockbert-1.0.2b1.recipe @@ -9,9 +9,10 @@ SRC_URI="git+https://github.com/HaikuArchives/DockBert#057c54674d" COPYRIGHT="2005 yellowTAB GmbH" LICENSE="BSD (3-clause)" -REVISION="2" +REVISION="3" ARCHITECTURES="x86_gcc2 x86 ?x86_64" +SECONDARY_ARCHITECTURES="x86_gcc2 x86" PROVIDES=" dockbert = $portVersion @@ -23,12 +24,12 @@ REQUIRES=" " BUILD_REQUIRES=" - haiku_devel >= $haikuVersion + haiku${secondaryArchSuffix}_devel >= $haikuVersion " BUILD_PREREQUIRES=" makefile_engine - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:make cmd:mkdepend " From 2db06f505dab80d925532779e7826f5ac2987363 Mon Sep 17 00:00:00 2001 From: diversys Date: Thu, 5 Jun 2014 10:32:18 +0000 Subject: [PATCH 2/2] netpulse: define OBJ_DIR in BUILD() --- haiku-apps/netpulse/netpulse-0.2.3.recipe | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haiku-apps/netpulse/netpulse-0.2.3.recipe b/haiku-apps/netpulse/netpulse-0.2.3.recipe index f2d0d5733..3a2d4da33 100644 --- a/haiku-apps/netpulse/netpulse-0.2.3.recipe +++ b/haiku-apps/netpulse/netpulse-0.2.3.recipe @@ -29,13 +29,13 @@ BUILD_PREREQUIRES=" BUILD() { - make $jobArgs + make $jobArgs OBJ_DIR=objects } INSTALL() { mkdir -p $appsDir - cp objects*/NetPulse $appsDir/NetPulse + cp objects/NetPulse $appsDir/NetPulse # Add a symlink to the Desktop applets directory in Deskbar desktopAppletsDir="$dataDir/deskbar/menu/Desktop applets"