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

scons: bump version.

Browse Source 
* depends explicitly on python 2.7.
This commit is contained in:
Jerome Duval
2015-10-17 11:55:14 +00:00
parent 3570a15616
commit 305f4e26b3
2 changed files with 53 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
dev-util/scons/patches/scons-2.2.0.patchset → dev-util/scons/patches/scons-2.4.0.patchset
View File

@@ -1,11 +1,11 @@
From 8f1968371d3426d08cba8dafa44eaaa0cb59b13f Mon Sep 17 00:00:00 2001
From 2e71e32dede3786cbee60262f96d5cefec150540 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
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 ca4bc9b..65a1fae 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
2.2.2
From e06a79e0c3f1fdf15fe9323efcbbb4cf1e90b388 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
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 bb9729a..6bc778d 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 6874301..406b12a 100644
--- a/engine/SCons/Tool/link.py
+++ b/engine/SCons/Tool/link.py
@@ -110,7 +110,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' or platform == 'sunos':
+ if platform == 'posix' or platform == 'sunos' or platform == 'haiku':
versionparts = version.split('.')
if hasattr(target[0].attributes, 'shlibname'):
name = target[0].attributes.shlibname
--
2.2.2

31
dev-util/scons/scons-2.2.0.recipe → dev-util/scons/scons-2.4.0.recipe
View File

@@ -8,39 +8,36 @@ HOMEPAGE="http://www.scons.org/"
COPYRIGHT="2001-2012 The SCons Foundation"
LICENSE="MIT"
REVISION="4"
SOURCE_URI="http://sourceforge.net/projects/scons/files/scons/2.2.0/scons-2.2.0.tar.gz"
CHECKSUM_SHA256="f7fcd11a7af7ec13d587a2f7cf14a92e3223eea64bf078454a9856ec0ab465b9"
PATCHES="scons-2.2.0.patchset"
SOURCE_URI="http://sourceforge.net/projects/scons/files/scons/$portVersion/scons-$portVersion.tar.gz"
CHECKSUM_SHA256="1892f472934f1f5947d0e4c5d01e3b992641425553faab4062ddb8e3504c1fb2"
PATCHES="scons-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PROVIDES="
scons = $portVersion compat >= 2.2
cmd:scons = $portVersion compat >= 2.2
cmd:scons_2.2.0 = $portVersion compat >= 2.2
cmd:scons_time = $portVersion compat >= 2.2
cmd:scons_time_2.2.0 = $portVersion compat >= 2.2
cmd:sconsign = $portVersion compat >= 2.2
cmd:sconsign_2.2.0 = $portVersion compat >= 2.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
cmd:python
cmd:python2.7
"
BUILD_REQUIRES="
haiku_devel
"
BUILD_PREREQUIRES="
cmd:python
cmd:python2.7
"
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
python2.7 setup.py build
}
INSTALL()
@@ -49,5 +46,5 @@ INSTALL()
options="$options --install-data=$documentationDir"
options="$options --symlink-scons"
options="$options --standard-lib"
python setup.py install $options
python2.7 setup.py install $options
}