summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/Python-2.6.1-sysbase.patch13
-rw-r--r--python/makefile.mk1
-rw-r--r--python/prj/d.lst6
3 files changed, 14 insertions, 6 deletions
diff --git a/python/Python-2.6.1-sysbase.patch b/python/Python-2.6.1-sysbase.patch
new file mode 100644
index 000000000000..fb81056c1595
--- /dev/null
+++ b/python/Python-2.6.1-sysbase.patch
@@ -0,0 +1,13 @@
+--- misc/Python-2.6.1/configure Thu Mar 17 13:00:41 2011
++++ misc/build/Python-2.6.1/configure Thu Mar 17 12:58:50 2011
+@@ -2042,7 +2042,9 @@
+ if test -z "$MACHDEP"
+ then
+ ac_sys_system=`uname -s`
+- if test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
++ if test -n "$OOO_SYSBASE_SYS_RELEASE"; then
++ ac_sys_release=$OOO_SYSBASE_SYS_RELEASE
++ elif test "$ac_sys_system" = "AIX" -o "$ac_sys_system" = "Monterey64" \
+ -o "$ac_sys_system" = "UnixWare" -o "$ac_sys_system" = "OpenUNIX"; then
+ ac_sys_release=`uname -v`
+ else
diff --git a/python/makefile.mk b/python/makefile.mk
index 806830033d35..ee25e7515777 100644
--- a/python/makefile.mk
+++ b/python/makefile.mk
@@ -51,6 +51,7 @@ PATCH_FILES=\
Python-$(PYVERSION).patch \
Python-parallel-make.patch \
Python-ssl.patch \
+ Python-2.6.1-sysbase.patch\
Python-2.6.1-nohardlink.patch
CONFIGURE_DIR=
diff --git a/python/prj/d.lst b/python/prj/d.lst
index def1bb84a414..e5c4d5bcb273 100644
--- a/python/prj/d.lst
+++ b/python/prj/d.lst
@@ -3,9 +3,6 @@ mkdir: %_DEST%\lib%_EXT%\python\lib-old
mkdir: %_DEST%\lib%_EXT%\python\lib-tk
mkdir: %_DEST%\lib%_EXT%\python\site-packages
mkdir: %_DEST%\lib%_EXT%\python\encodings
-mkdir: %_DEST%\lib%_EXT%\python\test
-mkdir: %_DEST%\lib%_EXT%\python\test\output
-mkdir: %_DEST%\lib%_EXT%\python\test\data
mkdir: %_DEST%\lib%_EXT%\python\email
mkdir: %_DEST%\lib%_EXT%\python\email\mime
mkdir: %_DEST%\lib%_EXT%\python\compiler
@@ -38,9 +35,6 @@ mkdir: %_DEST%\lib%_EXT%\python\ctypes\macholib
..\%__SRC%\misc\build\Python-2.6.1\Lib\lib-old\* %_DEST%\lib%_EXT%\python\lib-old\*
..\%__SRC%\misc\build\Python-2.6.1\Lib\lib-tk\* %_DEST%\lib%_EXT%\python\lib-tk\*
..\%__SRC%\misc\build\Python-2.6.1\Lib\site-packages\* %_DEST%\lib%_EXT%\python\site-packages\*
-..\%__SRC%\misc\build\Python-2.6.1\Lib\test\* %_DEST%\lib%_EXT%\python\test\*
-..\%__SRC%\misc\build\Python-2.6.1\Lib\test\output\* %_DEST%\lib%_EXT%\python\test\output\*
-..\%__SRC%\misc\build\Python-2.6.1\Lib\test\data\* %_DEST%\lib%_EXT%\python\test\data\*
..\%__SRC%\misc\build\Python-2.6.1\Lib\encodings\* %_DEST%\lib%_EXT%\python\encodings\*
..\%__SRC%\misc\build\Python-2.6.1\Lib\email\* %_DEST%\lib%_EXT%\python\email\*
..\%__SRC%\misc\build\Python-2.6.1\Lib\email\mime\* %_DEST%\lib%_EXT%\python\email\mime\*