[csw-devel] SF.net SVN: gar:[18902] csw/mgar/pkg/lang-python/pysvn/trunk/files
chninkel at users.sourceforge.net
chninkel at users.sourceforge.net
Tue Aug 7 23:10:27 CEST 2012
Revision: 18902
http://gar.svn.sourceforge.net/gar/?rev=18902&view=rev
Author: chninkel
Date: 2012-08-07 21:10:27 +0000 (Tue, 07 Aug 2012)
Log Message:
-----------
lang-python/pysvn/trunk: several compile fixes
Modified Paths:
--------------
csw/mgar/pkg/lang-python/pysvn/trunk/files/0001-fixes-for-tests.patch
csw/mgar/pkg/lang-python/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch
Added Paths:
-----------
csw/mgar/pkg/lang-python/pysvn/trunk/files/0004-fixes-SVN_LIB-macro.patch
csw/mgar/pkg/lang-python/pysvn/trunk/files/0005-no-rpath-with-SUN-ld.patch
csw/mgar/pkg/lang-python/pysvn/trunk/files/0006-fix-test-locale-problem.patch
Modified: csw/mgar/pkg/lang-python/pysvn/trunk/files/0001-fixes-for-tests.patch
===================================================================
--- csw/mgar/pkg/lang-python/pysvn/trunk/files/0001-fixes-for-tests.patch 2012-08-07 20:52:03 UTC (rev 18901)
+++ csw/mgar/pkg/lang-python/pysvn/trunk/files/0001-fixes-for-tests.patch 2012-08-07 21:10:27 UTC (rev 18902)
@@ -20,8 +20,17 @@
-echo '#!/bin/sh' >${TESTROOT}/repos/hooks/pre-commit
+echo '#!/opt/csw/bin/bash' >${TESTROOT}/repos/hooks/pre-commit
echo export PYTHONPATH=$PYTHONPATH >>${TESTROOT}/repos/hooks/pre-commit
- echo echo $PYTHON ${WORKDIR}/Tests/test_04_pre_commit_test_1.py '"$@"' ">${TESTROOT}/test_1.output" >>${TESTROOT}/repos/hooks/pre-commit
- echo $PYTHON ${WORKDIR}/Tests/test_04_pre_commit_test_1.py '"$@"' ">>${TESTROOT}/test_1.output" >>${TESTROOT}/repos/hooks/pre-commit
+ echo export LD_LIBRARY_PATH=$LD_LIBRARY_PATH >>${TESTROOT}/repos/hooks/pre-commit
+ echo export PATH=$PATH >>${TESTROOT}/repos/hooks/pre-commit
+@@ -38,7 +38,7 @@ echo echo $PYTHON ${WORKDIR}/Tests/test_04_commit_hook_test_1.py '"$@"' ">${TEST
+ echo $PYTHON ${WORKDIR}/Tests/test_04_commit_hook_test_1.py '"$@"' ">>${TESTROOT}/pre_test_1.output" >>${TESTROOT}/repos/hooks/pre-commit
+ chmod +x ${TESTROOT}/repos/hooks/pre-commit
+
+-echo '#!/bin/sh' >${TESTROOT}/repos/hooks/post-commit
++echo '#!/opt/csw/bin/bash' >${TESTROOT}/repos/hooks/post-commit
+ echo export PYTHONPATH=$PYTHONPATH >>${TESTROOT}/repos/hooks/post-commit
+ echo export LD_LIBRARY_PATH=$LD_LIBRARY_PATH >>${TESTROOT}/repos/hooks/post-commit
+ echo export PATH=$PATH >>${TESTROOT}/repos/hooks/post-commit
diff --git a/Tests/test-05.sh b/Tests/test-05.sh
index 32976c0..81f2754 100755
--- a/Tests/test-05.sh
Modified: csw/mgar/pkg/lang-python/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch
===================================================================
--- csw/mgar/pkg/lang-python/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch 2012-08-07 20:52:03 UTC (rev 18901)
+++ csw/mgar/pkg/lang-python/pysvn/trunk/files/0003-bin-bash-instead-of-bin-sh.patch 2012-08-07 21:10:27 UTC (rev 18902)
@@ -50,6 +50,7 @@
cmd () {
echo Info: Command: $*
+1.7.10.3
diff --git a/Tests/test-05.sh b/Tests/test-05.sh
index 8e892b9..32976c0 100755
--- a/Tests/test-05.sh
Added: csw/mgar/pkg/lang-python/pysvn/trunk/files/0004-fixes-SVN_LIB-macro.patch
===================================================================
--- csw/mgar/pkg/lang-python/pysvn/trunk/files/0004-fixes-SVN_LIB-macro.patch (rev 0)
+++ csw/mgar/pkg/lang-python/pysvn/trunk/files/0004-fixes-SVN_LIB-macro.patch 2012-08-07 21:10:27 UTC (rev 18902)
@@ -0,0 +1,53 @@
+From b1487ee041bde06527b29fbabf636d7425d08d50 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Tue, 7 Aug 2012 20:58:23 +0200
+Subject: [PATCH] Fixes SVN_LIB macro
+
+---
+ Source/setup_configure.py | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/Source/setup_configure.py b/Source/setup_configure.py
+index fddc636..4c3d1ae 100644
+--- a/Source/setup_configure.py
++++ b/Source/setup_configure.py
+@@ -221,6 +221,7 @@ class Setup:
+
+ print( 'Info: Using tool chain %s' % (self.c_utils.__class__.__name__,) )
+
++
+ self.c_utils.setupUtilities()
+ self.c_pysvn.setupPySvn()
+
+@@ -1211,7 +1212,7 @@ class CygwinCompilerGCC(UnixCompilerGCC):
+
+ def _getLdLibs( self ):
+ py_ld_libs = [
+- '-L%(svn_lib_dir)s',
++ '-L%(SVN_LIB)s',
+ '-L/usr/lib/python%d.%d/config -lpython%d.%d.dll' %
+ (sys.version_info[0], sys.version_info[1], sys.version_info[0], sys.version_info[1]),
+ '-lsvn_client-1',
+@@ -1251,7 +1252,7 @@ class AixCompilerGCC(UnixCompilerGCC):
+ python_exp = 'python.exp'
+
+ py_ld_libs = [
+- '-L%(svn_lib_dir)s',
++ '-L%(SVN_LIB)s',
+ '-lsvn_client-1',
+ '-lsvn_repos-1',
+ '-lsvn_subr-1',
+@@ -1284,8 +1285,8 @@ class SunOsCompilerGCC(UnixCompilerGCC):
+
+ def _getLdLibs( self ):
+ py_ld_libs = [
+- '-L%(svn_lib_dir)s',
+- '-Wl,--rpath -Wl,%(svn_lib_dir)s',
++ '-L%(SVN_LIB)s',
++ '-Wl,--rpath -Wl,%(SVN_LIB)s',
+ '-lsvn_client-1',
+ '-lsvn_diff-1',
+ '-lsvn_repos-1',
+--
+1.7.10.3
+
Added: csw/mgar/pkg/lang-python/pysvn/trunk/files/0005-no-rpath-with-SUN-ld.patch
===================================================================
--- csw/mgar/pkg/lang-python/pysvn/trunk/files/0005-no-rpath-with-SUN-ld.patch (rev 0)
+++ csw/mgar/pkg/lang-python/pysvn/trunk/files/0005-no-rpath-with-SUN-ld.patch 2012-08-07 21:10:27 UTC (rev 18902)
@@ -0,0 +1,25 @@
+From 2cd80b544670fd9ba767de3d25057458d191a732 Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Tue, 7 Aug 2012 21:11:08 +0200
+Subject: [PATCH] no rpath with SUN ld
+
+---
+ Source/setup_configure.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Source/setup_configure.py b/Source/setup_configure.py
+index 4c3d1ae..84fa6ed 100644
+--- a/Source/setup_configure.py
++++ b/Source/setup_configure.py
+@@ -1286,7 +1286,7 @@ class SunOsCompilerGCC(UnixCompilerGCC):
+ def _getLdLibs( self ):
+ py_ld_libs = [
+ '-L%(SVN_LIB)s',
+- '-Wl,--rpath -Wl,%(SVN_LIB)s',
++ '-Wl,-R -Wl,%(SVN_LIB)s',
+ '-lsvn_client-1',
+ '-lsvn_diff-1',
+ '-lsvn_repos-1',
+--
+1.7.10.3
+
Added: csw/mgar/pkg/lang-python/pysvn/trunk/files/0006-fix-test-locale-problem.patch
===================================================================
--- csw/mgar/pkg/lang-python/pysvn/trunk/files/0006-fix-test-locale-problem.patch (rev 0)
+++ csw/mgar/pkg/lang-python/pysvn/trunk/files/0006-fix-test-locale-problem.patch 2012-08-07 21:10:27 UTC (rev 18902)
@@ -0,0 +1,25 @@
+From 1bb9bbe8c922c2f48c9c17cbd2b9f9ba295eec7c Mon Sep 17 00:00:00 2001
+From: Yann Rouillard <yann at pleiades.fr.eu.org>
+Date: Tue, 7 Aug 2012 21:40:59 +0200
+Subject: [PATCH] fix test locale problem
+
+---
+ Examples/Client/svn_cmd.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Examples/Client/svn_cmd.py b/Examples/Client/svn_cmd.py
+index 9c3dc36..a1c9ff8 100644
+--- a/Examples/Client/svn_cmd.py
++++ b/Examples/Client/svn_cmd.py
+@@ -58,7 +58,7 @@ def main( args ):
+
+ def initLocale():
+ # init the locale
+- if sys.platform in ['win32','cygwin']:
++ if sys.platform in ['win32','cygwin','sunos5']:
+ locale.setlocale( locale.LC_ALL, '' )
+
+ else:
+--
+1.7.10.3
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list