diff options
| author | sb <sb@openoffice.org> | 2011-03-18 17:31:51 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2011-03-18 17:31:51 +0100 |
| commit | 0f34d16aa1d34415034823a5ee828819c3b258fa (patch) | |
| tree | 327f08cfa61937241ded7823f1abb211d1f21117 /python | |
| parent | e77a065bab11a45dc64f0277038674d25af0279a (diff) | |
masterfix from: sb140: #i117456# on Solaris 11 against Solaris 10 baseline, trick python configure into thinking it sees Solaris 10
(transplanted from 6402ce7b0667b255e70c517c4320ecaee2682c56)
Diffstat (limited to 'python')
| -rw-r--r-- | python/Python-2.6.1-sysbase.patch | 13 | ||||
| -rw-r--r-- | python/makefile.mk | 3 |
2 files changed, 15 insertions, 1 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 607ba93ab92d..f1e37729b111 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -50,7 +50,8 @@ TARFILE_MD5=e81c2f0953aa60f8062c05a4673f2be0 PATCH_FILES=\ Python-$(PYVERSION).patch \ Python-parallel-make.patch \ - Python-ssl.patch + Python-ssl.patch \ + Python-2.6.1-sysbase.patch CONFIGURE_DIR= |