From 0f34d16aa1d34415034823a5ee828819c3b258fa Mon Sep 17 00:00:00 2001
From: sb <sb@openoffice.org>
Date: Fri, 18 Mar 2011 17:31:51 +0100
Subject: masterfix from: sb140: #i117456# on Solaris 11 against Solaris 10
 baseline, trick python configure into thinking it sees Solaris 10
 (transplanted from 6402ce7b0667b255e70c517c4320ecaee2682c56)

---
 python/Python-2.6.1-sysbase.patch | 13 +++++++++++++
 python/makefile.mk                |  3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 python/Python-2.6.1-sysbase.patch

(limited to 'python')

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=
 
-- 
cgit 


From 77c6a8e3ac106240b9fca715affedd5280c1367e Mon Sep 17 00:00:00 2001
From: Hans-Joachim Lankenau <hjs@openoffice.org>
Date: Tue, 22 Mar 2011 10:24:28 +0100
Subject: ause127: #i117375# avoid hard links in python build

---
 python/Python-2.6.1-nohardlink.patch | 20 ++++++++++++++++++++
 python/makefile.mk                   |  3 ++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 python/Python-2.6.1-nohardlink.patch

(limited to 'python')

diff --git a/python/Python-2.6.1-nohardlink.patch b/python/Python-2.6.1-nohardlink.patch
new file mode 100644
index 000000000000..c552b1a0e126
--- /dev/null
+++ b/python/Python-2.6.1-nohardlink.patch
@@ -0,0 +1,20 @@
+--- misc/Python-2.6.1/Makefile.pre.in	2011-03-08 18:23:37.230410480 +0100
++++ misc/build/Python-2.6.1/Makefile.pre.in	2011-03-08 18:22:57.935746999 +0100
+@@ -414,7 +414,7 @@
+ libpython$(VERSION).so: $(LIBRARY_OBJS)
+ 	if test $(INSTSONAME) != $(LDLIBRARY); then \
+ 		$(LDSHARED) $(LDFLAGS) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+-		$(LN) -f $(INSTSONAME) $@; \
++		$(LN) -fs $(INSTSONAME) $@; \
+ 	else\
+ 		$(LDSHARED) $(LDFLAGS) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \
+ 	fi
+@@ -767,7 +767,7 @@
+ 	then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \
+ 	else true; \
+ 	fi
+-	(cd $(DESTDIR)$(BINDIR); $(LN) python$(VERSION)$(EXE) $(PYTHON))
++	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) $(PYTHON))
+ 	-rm -f $(DESTDIR)$(BINDIR)/python-config
+ 	(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python-config)
+ 
diff --git a/python/makefile.mk b/python/makefile.mk
index 607ba93ab92d..806830033d35 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-nohardlink.patch
 
 CONFIGURE_DIR=
 
-- 
cgit