scons, update and cleanup (#9830)

This commit is contained in:
Schrijvers Luc
2023-12-06 09:32:29 +01:00
committed by GitHub
parent b4a13de32b
commit 7184c1ad93
4 changed files with 22 additions and 453 deletions

View File

@@ -1,340 +0,0 @@
From 3609030bdb0666a1d4e2e06508d03948345c0450 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/haiku.py b/engine/SCons/Platform/haiku.py
new file mode 100644
index 0000000..547421e
--- /dev/null
+++ b/engine/SCons/Platform/haiku.py
@@ -0,0 +1,68 @@
+"""SCons.Platform.haiku
+
+Platform-specific initialization for Haiku systems.
+
+There normally shouldn't be any need to import this module directly. It
+will usually be imported through the generic SCons.Platform.Platform()
+selection method.
+"""
+
+#
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = ""
+
+import commands
+import os
+import posix
+
+def findDir(identifier):
+ return commands.getoutput('finddir %s' % identifier)
+
+def generate(env):
+ posix.generate(env)
+
+ # determine, if building for the secondary architecture
+ secondaryArch = os.environ.get('HAIKU_SECONDARY_ARCH')
+ archSubDir = '/' + secondaryArch if secondaryArch else ''
+
+ # PATH
+ pathDescriptions = [
+ ('B_USER_NONPACKAGED_BIN_DIRECTORY', None),
+ ('B_USER_BIN_DIRECTORY', None),
+ ('B_SYSTEM_NONPACKAGED_BIN_DIRECTORY', None),
+ ('B_SYSTEM_BIN_DIRECTORY', None)
+ ]
+
+ paths = []
+ for pathConstant, subDir in pathDescriptions:
+ path = findDir(pathConstant)
+ if subDir:
+ path += '/' + subDir
+ paths.append(path)
+
+ if secondaryArch:
+ # prepend the secondary arch subdirectories
+ paths = [path + archSubDir for path in paths] + paths
+
+ env['ENV']['PATH'] = ':'.join(paths)
diff --git a/src/engine/SCons/Platform/__init__.py b/src/engine/SCons/Platform/__init__.py
index 7d959b7..1ca4685 100644
--- a/src/engine/SCons/Platform/__init__.py
+++ b/src/engine/SCons/Platform/__init__.py
@@ -80,6 +80,8 @@ def platform_default():
return 'aix'
elif sys.platform.find('darwin') != -1:
return 'darwin'
+ elif sys.platform.find('haiku') != -1:
+ return 'haiku'
else:
return 'posix'
elif os.name == 'os2':
--
2.24.0
From 22a5f208e276e2f87cb6a4ff899c782563b1c12b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 22 Jan 2020 22:35:19 +0100
Subject: python3 support
diff --git a/engine/SCons/Platform/haiku.py b/engine/SCons/Platform/haiku.py
index 547421e..dd83ef8 100644
--- a/engine/SCons/Platform/haiku.py
+++ b/engine/SCons/Platform/haiku.py
@@ -32,12 +32,12 @@ selection method.
__revision__ = ""
-import commands
import os
-import posix
+import subprocess
+from . import posix
def findDir(identifier):
- return commands.getoutput('finddir %s' % identifier)
+ return str(subprocess.check_output(['finddir', identifier], shell=False).rstrip())
def generate(env):
posix.generate(env)
--
2.24.0
From c5c4b805b0096616b58889066a0d36f07a089bd1 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 27 Apr 2020 14:05:11 +0200
Subject: move platform haiku file
diff --git a/engine/SCons/Platform/haiku.py b/src/engine/SCons/Platform/haiku.py
similarity index 100%
rename from engine/SCons/Platform/haiku.py
rename to src/engine/SCons/Platform/haiku.py
--
2.24.0
From 59619e1319ef38b81daf9be13642fbec1a7a7925 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 27 Apr 2020 14:05:11 +0200
Subject: move platform haiku file
diff --git a/src/engine/MANIFEST.in b/src/engine/MANIFEST.in
index 3125824..231d3fc 100644
--- a/src/engine/MANIFEST.in
+++ b/src/engine/MANIFEST.in
@@ -24,6 +24,7 @@ SCons/Platform/__init__.py
SCons/Platform/aix.py
SCons/Platform/cygwin.py
SCons/Platform/darwin.py
+SCons/Platform/haiku.py
SCons/Platform/hpux.py
SCons/Platform/irix.py
SCons/Platform/os2.py
diff --git a/src/engine/SCons/Platform/haiku.py b/src/engine/SCons/Platform/haiku.py
index 80d3b06..b9cd656 100644
--- a/src/engine/SCons/Platform/haiku.py
+++ b/src/engine/SCons/Platform/haiku.py
@@ -61,6 +61,8 @@ def generate(env):
path += '/' + subDir
paths.append(path)
+ paths.append('/bin')
+
if secondaryArch:
# prepend the secondary arch subdirectories
paths = [path + archSubDir for path in paths] + paths
--
2.24.0
From b8f691d4e2685e443f9604ac548afae2e72e1910 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 27 Apr 2020 21:28:15 +0200
Subject: Haiku: add LIBRARY_PATH handling
diff --git a/SConstruct b/SConstruct
index 1adf714..e67cbf9 100644
--- a/SConstruct
+++ b/SConstruct
@@ -143,7 +143,7 @@ for a in addpaths:
# built with the --enable-shared option.
ENV = { 'PATH' : os.environ['PATH'] }
-for key in ['LOGNAME', 'PYTHONPATH', 'LD_LIBRARY_PATH']:
+for key in ['LOGNAME', 'PYTHONPATH', 'LD_LIBRARY_PATH', 'LIBRARY_PATH']:
if key in os.environ:
ENV[key] = os.environ[key]
diff --git a/test/CC/SHCCFLAGS.py b/test/CC/SHCCFLAGS.py
index 72d36b1..10989a6 100644
--- a/test/CC/SHCCFLAGS.py
+++ b/test/CC/SHCCFLAGS.py
@@ -36,6 +36,8 @@ barflags = e['SHCCFLAGS'] + ' -DBAR'
if os.name == 'posix':
os.environ['LD_LIBRARY_PATH'] = '.'
+if sys.platform[:5] == 'haiku':
+ os.environ['LIBRARY_PATH'] = '.'
if sys.platform.find('irix') > -1:
os.environ['LD_LIBRARYN32_PATH'] = '.'
diff --git a/test/CC/SHCFLAGS.py b/test/CC/SHCFLAGS.py
index 3ec6778..e9821b8 100644
--- a/test/CC/SHCFLAGS.py
+++ b/test/CC/SHCFLAGS.py
@@ -36,6 +36,8 @@ barflags = e['SHCFLAGS'] + ' -DBAR'
if os.name == 'posix':
os.environ['LD_LIBRARY_PATH'] = '.'
+if sys.platform[:5] == 'haiku':
+ os.environ['LIBRARY_PATH'] = '.'
if sys.platform.find('irix') > -1:
os.environ['LD_LIBRARYN32_PATH'] = '.'
diff --git a/test/CXX/CXXFLAGS.py b/test/CXX/CXXFLAGS.py
index 8d72708..ecfa985 100644
--- a/test/CXX/CXXFLAGS.py
+++ b/test/CXX/CXXFLAGS.py
@@ -38,6 +38,8 @@ _obj = TestSCons._obj
if os.name == 'posix':
os.environ['LD_LIBRARY_PATH'] = '.'
+if sys.platform[:5] == 'haiku':
+ os.environ['LIBRARY_PATH'] = '.'
if sys.platform.find('irix') > -1:
os.environ['LD_LIBRARYN32_PATH'] = '.'
diff --git a/test/CXX/SHCXXFLAGS.py b/test/CXX/SHCXXFLAGS.py
index 343be30..824e49f 100644
--- a/test/CXX/SHCXXFLAGS.py
+++ b/test/CXX/SHCXXFLAGS.py
@@ -37,6 +37,8 @@ _obj = TestSCons._obj
if os.name == 'posix':
os.environ['LD_LIBRARY_PATH'] = '.'
+if sys.platform[:5] == 'haiku':
+ os.environ['LIBRARY_PATH'] = '.'
if sys.platform.find('irix') > -1:
os.environ['LD_LIBRARYN32_PATH'] = '.'
diff --git a/test/LINK/VersionedLib-VariantDir.py b/test/LINK/VersionedLib-VariantDir.py
index 4a5ac40..b3eefef 100644
--- a/test/LINK/VersionedLib-VariantDir.py
+++ b/test/LINK/VersionedLib-VariantDir.py
@@ -96,6 +96,8 @@ if platform == 'cygwin' or platform == 'win32':
if os.name == 'posix':
os.environ['LD_LIBRARY_PATH'] = test.workpath('build/lib')
+if sys.platform.find('haiku') != -1:
+ os.environ['LIBRARY_PATH'] = test.workpath('build/lib')
if sys.platform.find('irix') != -1:
os.environ['LD_LIBRARYN32_PATH'] = test.workpath('build/lib')
diff --git a/test/LINK/VersionedLib-j2.py b/test/LINK/VersionedLib-j2.py
index 0cde91c..09fa82c 100644
--- a/test/LINK/VersionedLib-j2.py
+++ b/test/LINK/VersionedLib-j2.py
@@ -77,6 +77,8 @@ if platform == 'cygwin':
if os.name == 'posix':
os.environ['LD_LIBRARY_PATH'] = test.workpath('.')
+if sys.platform.find('haiku') != -1:
+ os.environ['LIBRARY_PATH'] = test.workpath('.')
if sys.platform.find('irix') != -1:
os.environ['LD_LIBRARYN32_PATH'] = test.workpath('.')
diff --git a/test/LINK/VersionedLib-subdir.py b/test/LINK/VersionedLib-subdir.py
index 66fef63..c82b268 100644
--- a/test/LINK/VersionedLib-subdir.py
+++ b/test/LINK/VersionedLib-subdir.py
@@ -88,6 +88,8 @@ if platform == 'cygwin' or platform == 'win32':
if os.name == 'posix':
os.environ['LD_LIBRARY_PATH'] = subdir
+if sys.platform.find('haiku') != -1:
+ os.environ['LIBRARY_PATH'] = subdir
if sys.platform.find('irix') != -1:
os.environ['LD_LIBRARYN32_PATH'] = subdir
diff --git a/test/Libs/SharedLibrary.py b/test/Libs/SharedLibrary.py
index 9e22cfa..8922b24 100644
--- a/test/Libs/SharedLibrary.py
+++ b/test/Libs/SharedLibrary.py
@@ -209,6 +209,8 @@ test.run(arguments = '.',
if os.name == 'posix':
os.environ['LD_LIBRARY_PATH'] = '.'
+if sys.platform.find('haiku') != -1:
+ os.environ['LIBRARY_PATH'] = '.'
if sys.platform.find('irix') != -1:
os.environ['LD_LIBRARYN32_PATH'] = '.'
diff --git a/test/LoadableModule.py b/test/LoadableModule.py
index 18a9c43..744eb84 100644
--- a/test/LoadableModule.py
+++ b/test/LoadableModule.py
@@ -112,6 +112,7 @@ test.run(arguments = '.',
if sys.platform in platforms_with_dlopen:
os.environ['LD_LIBRARY_PATH'] = test.workpath()
+ os.environ['LIBRARY_PATH'] = test.workpath()
test.run(program = test.workpath('dlopenprog'),
stdout = "f1.c\ndlopenprog.c\n")
diff --git a/test/NodeOps.py b/test/NodeOps.py
index 99a3f6a..2b663db 100644
--- a/test/NodeOps.py
+++ b/test/NodeOps.py
@@ -46,6 +46,8 @@ _dll = TestSCons._dll
if os.name == 'posix':
os.environ['LD_LIBRARY_PATH'] = '.'
+if sys.platform[:5] == 'haiku':
+ os.environ['LIBRARY_PATH'] = '.'
if sys.platform.find('irix') > -1:
os.environ['LD_LIBRARYN32_PATH'] = '.'
diff --git a/test/Repository/SharedLibrary.py b/test/Repository/SharedLibrary.py
index 51142aa..42eb4b4 100644
--- a/test/Repository/SharedLibrary.py
+++ b/test/Repository/SharedLibrary.py
@@ -112,6 +112,8 @@ test.run(chdir='work',
if os.name == 'posix':
if sys.platform[:6] == 'darwin':
os.environ['DYLD_LIBRARY_PATH'] = test.workpath('work')
+ elif sys.platform[:5] == 'haiku':
+ os.environ['LIBRARY_PATH'] = test.workpath('work')
else:
os.environ['LD_LIBRARY_PATH'] = test.workpath('work')
if sys.platform.find('irix') != -1:
--
2.24.0

View File

@@ -1,11 +1,11 @@
From 9c3663eb506294c8d47ebd5dcc850995d2997809 Mon Sep 17 00:00:00 2001
From b77bebdf15ede3d5817c4aa16a2b9d5b447e4e5d 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/SCons/Platform/__init__.py b/SCons/Platform/__init__.py
index 3fa5a75..ba0bb3c 100644
index 77eea5c..3bd20d6 100644
--- a/SCons/Platform/__init__.py
+++ b/SCons/Platform/__init__.py
@@ -75,6 +75,8 @@ def platform_default():
@@ -94,20 +94,20 @@ index 0000000..3ea01f8
+
+ env['ENV']['PATH'] = ':'.join(paths)
--
2.37.3
2.42.1
From 1f20a4918e666e2b4ac085a47c5ce00fe1c719de Mon Sep 17 00:00:00 2001
From 0d05b41773f3b766ad1f86f43db88fd4f20a1af8 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 27 Apr 2020 21:28:15 +0200
Subject: Haiku: add LIBRARY_PATH handling
diff --git a/site_scons/BuildCommandLine.py b/site_scons/BuildCommandLine.py
index 14bc279..6776d15 100644
index d401aed..465ae61 100644
--- a/site_scons/BuildCommandLine.py
+++ b/site_scons/BuildCommandLine.py
@@ -151,7 +151,7 @@ class BuildCommandLine:
@@ -204,7 +204,7 @@ class BuildCommandLine:
# Re-exporting LD_LIBRARY_PATH is necessary if the Python version was
# built with the --enable-shared option.
self.ENV = {'PATH': os.environ['PATH']}
@@ -182,7 +182,7 @@ index 4a5ac40..b3eefef 100644
os.environ['LD_LIBRARYN32_PATH'] = test.workpath('build/lib')
diff --git a/test/LINK/VersionedLib-j2.py b/test/LINK/VersionedLib-j2.py
index 0cde91c..09fa82c 100644
index 8f84a1a..436e179 100644
--- a/test/LINK/VersionedLib-j2.py
+++ b/test/LINK/VersionedLib-j2.py
@@ -77,6 +77,8 @@ if platform == 'cygwin':
@@ -195,7 +195,7 @@ index 0cde91c..09fa82c 100644
os.environ['LD_LIBRARYN32_PATH'] = test.workpath('.')
diff --git a/test/LINK/VersionedLib-subdir.py b/test/LINK/VersionedLib-subdir.py
index 66fef63..c82b268 100644
index 53ae5d0..bcb5de6 100644
--- a/test/LINK/VersionedLib-subdir.py
+++ b/test/LINK/VersionedLib-subdir.py
@@ -88,6 +88,8 @@ if platform == 'cygwin' or platform == 'win32':
@@ -233,7 +233,7 @@ index 18a9c43..744eb84 100644
stdout = "f1.c\ndlopenprog.c\n")
diff --git a/test/NodeOps.py b/test/NodeOps.py
index a5300f1..d8499a8 100644
index a2db429..9cd5dba 100644
--- a/test/NodeOps.py
+++ b/test/NodeOps.py
@@ -42,6 +42,8 @@ from TestSCons import _exe, lib_, _lib, _obj, dll_, _dll
@@ -259,10 +259,10 @@ index 04ce1a5..0f1ee40 100644
os.environ['LD_LIBRARY_PATH'] = test.workpath('work')
if sys.platform.find('irix') != -1:
--
2.37.3
2.42.1
From 9436254077045567871ab78633b839300e5f85f2 Mon Sep 17 00:00:00 2001
From e7d3755df9eff0977a13384241ca9f73c53dda4f Mon Sep 17 00:00:00 2001
From: Han Pengfei <pengphei@qq.com>
Date: Thu, 27 Oct 2022 10:15:59 +0000
Subject: Remove man page generated for package
@@ -270,10 +270,10 @@ Subject: Remove man page generated for package
Signed-off-by: Han Pengfei <pengphei@qq.com>
diff --git a/setup.cfg b/setup.cfg
index 941db34..8df6646 100644
index b6d7a5e..37f2f6a 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -67,10 +67,10 @@ console_scripts =
@@ -69,10 +69,10 @@ console_scripts =
SCons.Tool.docbook = *.*
@@ -287,7 +287,7 @@ index 941db34..8df6646 100644
+# sconsign.1
[sdist]
dist_dir=build/dist
dist_dir=build/dist
--
2.37.3
2.42.1

View File

@@ -1,93 +0,0 @@
SUMMARY="A software construction tool"
DESCRIPTION="SCons is an open-source software construction tool - that is, a \
next-generation build tool. Think of SCons as an improved, cross-platform \
substitute for the classic Make utility with integrated functionality similar \
to autoconf/automake and compiler caches such as ccache. In short, SCons is \
an easier, more reliable and faster way to build software."
HOMEPAGE="https://www.scons.org/"
COPYRIGHT="2001-2019 The SCons Foundation"
LICENSE="MIT"
REVISION="4"
SOURCE_URI="https://github.com/scons/scons/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="f758368332adb4436a2ede6340e95922f1c62a6dc03609dad376b22aa47ae3d8"
SOURCE_FILENAME="scons-$portVersion.tar.gz"
PATCHES="scons-$portVersion.patchset"
ARCHITECTURES="all"
PROVIDES="
scons = $portVersion compat >= 3
cmd:scons = $portVersion compat >= 3
cmd:scons_$portVersion = $portVersion compat >= 3
cmd:scons_configure_cache = $portVersion compat >= 3
cmd:scons_configure_cache_$portVersion = $portVersion compat >= 3
cmd:scons_time = $portVersion compat >= 3
cmd:scons_time_$portVersion = $portVersion compat >= 3
cmd:sconsign = $portVersion compat >= 3
cmd:sconsign_$portVersion = $portVersion compat >= 3
"
REQUIRES="
haiku
cmd:python3
"
BUILD_REQUIRES="
haiku_devel
"
BUILD_PREREQUIRES="
cmd:python3
cmd:sed
"
TEST_REQUIRES="
cmd:gcc
"
PATCH()
{
copyright='Copyright (c) 2001 - 2019 The SCons Foundation'
release='2019-12-17'
for file in `find . -iname "*.py" -type f`; do
sed -i \
-e "s|__COPYRIGHT__|$copyright|g" \
-e "s|__DATE__|$release|g" \
-e "s|__BUILDSYS__|none|g" \
-e "s|__DEVELOPER__|none|g" \
-e "s|__REVISION__|none|g" \
-e "s|__FILE__|$file|g" \
-e "s|__VERSION__|$portVersion|g" \
$file
done
}
BUILD()
{
# prepare scripts
for _script in scons{,ign,-time,-configure-cache}; do
cp src/script/${_script}.py src/script/${_script}
done
(
python3 bootstrap.py SConstruct doc
)
(
cd src
python3 setup.py build
)
}
INSTALL()
{
cd src
python3 setup.py install \
--prefix="$prefix" \
--install-data="$documentationDir" \
--symlink-scons \
--standard-lib \
--no-install-bat \
--no-install-man
sed -i s/python/python3/ $binDir/scons
}
TEST()
{
python3 ./runtest.py -a -t
}

View File

@@ -5,14 +5,15 @@ substitute for the classic Make utility with integrated functionality similar \
to autoconf/automake and compiler caches such as ccache. In short, SCons is \
an easier, more reliable and faster way to build software."
HOMEPAGE="https://www.scons.org/"
COPYRIGHT="2001-2021 The SCons Foundation"
COPYRIGHT="2001-2023 The SCons Foundation"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="https://github.com/scons/scons/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="b4fef9df167b16b94a91bcc3905c595a5768a433f2aee9abe7f4fffac201eeaa"
CHECKSUM_SHA256="085fc9df961224b91ed715c5c44a11796a3e614d146139989ab14e8a347425ff"
SOURCE_FILENAME="scons-$portVersion.tar.gz"
PATCHES="scons-$portVersion.patchset"
PYTHON_VERSION="3.9"
PYTHON_VERSION="3.10"
python_PACKAGE="python310"
ARCHITECTURES="all"
@@ -32,8 +33,9 @@ REQUIRES="
BUILD_REQUIRES="
haiku_devel
setuptools_python39
wheel_python39
pip_$python_PACKAGE
setuptools_$python_PACKAGE
wheel_$python_PACKAGE
"
BUILD_PREREQUIRES="
cmd:python$PYTHON_VERSION