From c49802d559797157ec35805e36c4b6a129c3efc3 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 17 Aug 2014 15:49:08 +0000 Subject: [PATCH] scons: changes to build serf. * 2.3.1 isn't compatible with 2.0. * some checks for posix have to be extended for haiku as well: link, soname * don't patch python shebang --- dev-util/scons/patches/scons-2.3.1.patchset | 42 +++++++++++++++++++-- dev-util/scons/scons-2.3.1.recipe | 19 ++++------ 2 files changed, 47 insertions(+), 14 deletions(-) diff --git a/dev-util/scons/patches/scons-2.3.1.patchset b/dev-util/scons/patches/scons-2.3.1.patchset index 1ecca99d2..d2cd69529 100644 --- a/dev-util/scons/patches/scons-2.3.1.patchset +++ b/dev-util/scons/patches/scons-2.3.1.patchset @@ -1,11 +1,11 @@ -From 8f1968371d3426d08cba8dafa44eaaa0cb59b13f Mon Sep 17 00:00:00 2001 +From f7ff33fe121102ad98002de146f4265c185ed3a2 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Fri, 9 Aug 2013 17:46:35 +0200 Subject: Add support for the Haiku platform diff --git a/engine/SCons/Platform/__init__.py b/engine/SCons/Platform/__init__.py -index 2cab3c8..373938d 100644 +index 25ea93e..bda7cb1 100644 --- a/engine/SCons/Platform/__init__.py +++ b/engine/SCons/Platform/__init__.py @@ -78,6 +78,8 @@ def platform_default(): @@ -93,5 +93,41 @@ index 0000000..5c802dd + + env['ENV']['PATH'] = ':'.join(paths) -- -1.7.10.2 +1.8.3.4 + + +From 9432a1a69d13d1534f6c4d96081cddcb7c566387 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sun, 17 Aug 2014 13:20:45 +0000 +Subject: Haiku patch + + +diff --git a/engine/SCons/Tool/__init__.py b/engine/SCons/Tool/__init__.py +index b946507..d1a74ba 100644 +--- a/engine/SCons/Tool/__init__.py ++++ b/engine/SCons/Tool/__init__.py +@@ -305,7 +305,7 @@ symlinks for the platform we are on""" + + if version: + # set the shared library link flags +- if platform == 'posix': ++ if platform == 'posix' or platform == 'haiku': + shlink_flags += [ '-Wl,-Bsymbolic' ] + # OpenBSD doesn't usually use SONAME for libraries + if not sys.platform.startswith('openbsd'): +diff --git a/engine/SCons/Tool/link.py b/engine/SCons/Tool/link.py +index f6e883f..ed39ab3 100644 +--- a/engine/SCons/Tool/link.py ++++ b/engine/SCons/Tool/link.py +@@ -98,7 +98,7 @@ def shlib_emitter_names(target, source, env): + # We need a version of the form x.y.z to proceed + raise ValueError + if version: +- if platform == 'posix': ++ if platform == 'posix' or platform == 'haiku': + versionparts = version.split('.') + name = target[0].name + # generate library name with the version number +-- +1.8.3.4 diff --git a/dev-util/scons/scons-2.3.1.recipe b/dev-util/scons/scons-2.3.1.recipe index 636281c94..9307bc62d 100644 --- a/dev-util/scons/scons-2.3.1.recipe +++ b/dev-util/scons/scons-2.3.1.recipe @@ -11,19 +11,19 @@ LICENSE="MIT" COPYRIGHT="2001-2012 The SCons Foundation" SRC_URI="http://sourceforge.net/projects/scons/files/scons/$portVersion/scons-$portVersion.tar.gz" CHECKSUM_SHA256="091ab468f8e6084c30f3ae9fd48828e3884021401cfef4b713d13161ba120201" -REVISION="3" +REVISION="4" ARCHITECTURES="x86_gcc2 x86 x86_64" PATCHES="scons-2.3.1.patchset" PROVIDES=" - scons = $portVersion compat >= 2 - cmd:scons = $portVersion compat >= 2 - cmd:scons_$portVersion = $portVersion compat >= 2 - cmd:scons_time = $portVersion compat >= 2 - cmd:scons_time_$portVersion = $portVersion compat >= 2 - cmd:sconsign = $portVersion compat >= 2 - cmd:sconsign_$portVersion = $portVersion compat >= 2 + scons = $portVersion compat >= 2.3 + cmd:scons = $portVersion compat >= 2.3 + cmd:scons_$portVersion = $portVersion compat >= 2.3 + cmd:scons_time = $portVersion compat >= 2.3 + cmd:scons_time_$portVersion = $portVersion compat >= 2.3 + cmd:sconsign = $portVersion compat >= 2.3 + cmd:sconsign_$portVersion = $portVersion compat >= 2.3 " REQUIRES=" haiku >= $haikuVersion @@ -37,9 +37,6 @@ BUILD_PREREQUIRES=" BUILD() { - for f in "script/scons script/scons-time script/sconsign"; do - sed -i -e "s@#! /usr/bin/env python@#! /bin/env python@" $f - done python setup.py build }