From dadd33666f56e7f457d3cee882bb19077b087c5d Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Thu, 14 Nov 2013 02:21:43 -0700 Subject: [PATCH] Fix beam and mark as available for gcc4 --HG-- extra : rebase_source : 0342786067b18f00e9e36577923f1784eb270164 --- haiku-apps/beam/beam-1.2alpha.recipe | 7 ++++-- .../beam/patches/beam-1.2alpha.patchset | 22 +++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 haiku-apps/beam/patches/beam-1.2alpha.patchset diff --git a/haiku-apps/beam/beam-1.2alpha.recipe b/haiku-apps/beam/beam-1.2alpha.recipe index cba53c551..042bc9e34 100644 --- a/haiku-apps/beam/beam-1.2alpha.recipe +++ b/haiku-apps/beam/beam-1.2alpha.recipe @@ -1,8 +1,8 @@ SUMMARY="An e-mail client." HOMEPAGE="http://beam.sourceforge.net" SRC_URI="git://beam.git.sourceforge.net/gitroot/beam/beam" -REVISION="2" -ARCHITECTURES="x86_gcc2" +REVISION="3" +ARCHITECTURES="x86_gcc2 x86" PROVIDES=" beam = $portVersion " @@ -24,6 +24,9 @@ BUILD_PREREQUIRES=" cmd:bison cmd:flex " + +PATCHES="beam-1.2alpha.patchset" + BUILD() { jam -q $jobArgs diff --git a/haiku-apps/beam/patches/beam-1.2alpha.patchset b/haiku-apps/beam/patches/beam-1.2alpha.patchset new file mode 100644 index 000000000..5ac3ffe2d --- /dev/null +++ b/haiku-apps/beam/patches/beam-1.2alpha.patchset @@ -0,0 +1,22 @@ +From 6545d15dfc53594f4141047bf4c84d55cfccda6d Mon Sep 17 00:00:00 2001 +From: Chris Roberts +Date: Thu, 14 Nov 2013 02:12:56 -0700 +Subject: Adjust search path for libbnetapi + + +diff --git a/build-jam/BuildSettings b/build-jam/BuildSettings +index d411b68..4874ac6 100644 +--- a/build-jam/BuildSettings ++++ b/build-jam/BuildSettings +@@ -44,7 +44,7 @@ if $(OSPLAT) = X86 { + PLATFORM = zeta ; + } + # check for libbnetapi... +- local haveLibbnetapi = [ GLOB /boot/develop/lib/x86 : libbnetapi.so ] ; ++ local haveLibbnetapi = [ GLOB /boot/system/develop/lib : libbnetapi.so ] ; + if $(haveLibbnetapi) { + LIBNETAPI = bnetapi ; + } +-- +1.8.3.4 +