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

patch cleanup: Make sure recipes have matching patches.

Browse Source 
* Ruby 1.9.3 shouldn't point to the 1.9.1 patch, etc.
This commit is contained in:
Alexander von Gluck IV
2014-06-12 20:44:02 +00:00
parent 61b230f8f8
commit c522c1de50
20 changed files with 1259 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
dev-util/scons/patches/scons-2.2.0.patch → dev-util/scons/patches/scons-2.3.1.patchset
View File

@@ -1,7 +1,14 @@
diff -Naur ./scons-2.2.0/engine/SCons/Platform/__init__.py ./scons-2.2.0-haiku/engine/SCons/Platform/__init__.py
--- ./scons-2.2.0/engine/SCons/Platform/__init__.py 2012-08-05 15:38:31.009961472 +0000
+++ ./scons-2.2.0-haiku/engine/SCons/Platform/__init__.py 2012-09-30 13:28:21.978583552 +0000
@@ -78,6 +78,8 @@
From 8f1968371d3426d08cba8dafa44eaaa0cb59b13f 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
--- a/engine/SCons/Platform/__init__.py
+++ b/engine/SCons/Platform/__init__.py
@@ -78,6 +78,8 @@ def platform_default():
return 'aix'
elif sys.platform.find('darwin') != -1:
return 'darwin'
@@ -10,10 +17,12 @@ diff -Naur ./scons-2.2.0/engine/SCons/Platform/__init__.py ./scons-2.2.0-haiku/e
else:
return 'posix'
elif os.name == 'os2':
diff -Naur ./scons-2.2.0/engine/SCons/Platform/haiku.py ./scons-2.2.0-haiku/engine/SCons/Platform/haiku.py
--- ./scons-2.2.0/engine/SCons/Platform/haiku.py 1970-01-01 00:00:00.000000000 +0000
+++ ./scons-2.2.0-haiku/engine/SCons/Platform/haiku.py 2012-09-30 13:30:07.109051904 +0000
@@ -0,0 +1,54 @@
diff --git a/engine/SCons/Platform/haiku.py b/engine/SCons/Platform/haiku.py
new file mode 100644
index 0000000..5c802dd
--- /dev/null
+++ b/engine/SCons/Platform/haiku.py
@@ -0,0 +1,69 @@
+"""SCons.Platform.haiku
+
+Platform-specific initialization for Haiku systems.
@@ -48,23 +57,41 @@ diff -Naur ./scons-2.2.0/engine/SCons/Platform/haiku.py ./scons-2.2.0-haiku/engi
+
+__revision__ = ""
+
+import posix
+import commands
+import os
+import posix
+
+def findDir( identifier ):
+ return commands.getoutput( 'finddir %s' % identifier )
+def findDir(identifier):
+ return commands.getoutput('finddir %s' % identifier)
+
+def generate(env):
+ posix.generate(env)
+
+ # path list
+ listPath = [ '.' ]
+ listPath.append( '%s/bin' % findDir( 'B_USER_CONFIG_DIRECTORY' ) )
+ listPath.append( findDir( 'B_COMMON_BIN_DIRECTORY' ) )
+ listPath.append( findDir( 'B_SYSTEM_BIN_DIRECTORY' ) )
+ listPath.append( findDir( 'B_BEOS_BIN_DIRECTORY' ) )
+ listPath.append( '%s/tools/gnupro/bin' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' ) )
+ env['ENV']['PATH'] = ':'.join( listPath )
+
+ # help the linker find the startfiles
+ env['ENV']['BELIBRARIES'] = ':%s/lib/x86' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' )
+
+ # 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_CONFIG_DIRECTORY', 'bin'),
+ ('B_COMMON_NONPACKAGED_BIN_DIRECTORY', None),
+ ('B_COMMON_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)
--
1.7.10.2

2
dev-util/scons/scons-2.3.1.recipe
View File

@@ -14,7 +14,7 @@ CHECKSUM_SHA256="091ab468f8e6084c30f3ae9fd48828e3884021401cfef4b713d13161ba12020
REVISION="3"
ARCHITECTURES="x86_gcc2 x86 x86_64"
PATCHES="scons-2.2.0.patchset"
PATCHES="scons-2.3.1.patchset"
PROVIDES="
scons = $portVersion compat >= 2