The makefile.mk uses a ld to link the libraries, but ld fails to link with

-pthread. The correct sollution is to use $(LINK) which points to the
used gcc compiler. Unfortunately gcc doesn't understand --whole-archive and
--no-whole-archive. You have to use -Wl,-whole-archive and
-Wl,-no-whole-archive
instead. The following patch does this for FreeBSD, but maybe this should also
be done for the generic UNX case.
See http://www.openoffice.org/issues/show_bug.cgi?id=18064 for details.
Obtained from Volker Quetschke

17 files changed, 187 insertions, 0 deletions

diff --git a/editors/openoffice-1.1-devel/files/patch-python-makefile.mk b/editors/openoffice-1.1-devel/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread
diff --git a/editors/openoffice-1.1/files/patch-python-makefile.mk b/editors/openoffice-1.1/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread
diff --git a/editors/openoffice-2.0-devel/files/patch-python-makefile.mk b/editors/openoffice-2.0-devel/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread
diff --git a/editors/openoffice-3-devel/files/patch-python-makefile.mk b/editors/openoffice-3-devel/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread
diff --git a/editors/openoffice-3/files/patch-python-makefile.mk b/editors/openoffice-3/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice-3/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread
diff --git a/editors/openoffice-devel/files/patch-python-makefile.mk b/editors/openoffice-devel/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread
diff --git a/editors/openoffice.org-1.1-devel/files/patch-python-makefile.mk b/editors/openoffice.org-1.1-devel/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread
diff --git a/editors/openoffice.org-1.1/files/patch-python-makefile.mk b/editors/openoffice.org-1.1/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread
diff --git a/editors/openoffice.org-2-RC/files/patch-python-makefile.mk b/editors/openoffice.org-2-RC/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread
diff --git a/editors/openoffice.org-2-devel/files/patch-python-makefile.mk b/editors/openoffice.org-2-devel/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread
diff --git a/editors/openoffice.org-2.0-devel/files/patch-python-makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread
diff --git a/editors/openoffice.org-2.0/files/patch-python-makefile.mk b/editors/openoffice.org-2.0/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread
diff --git a/editors/openoffice.org-2/files/patch-python-makefile.mk b/editors/openoffice.org-2/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread
diff --git a/editors/openoffice.org-3-RC/files/patch-python-makefile.mk b/editors/openoffice.org-3-RC/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread
diff --git a/editors/openoffice.org-3-devel/files/patch-python-makefile.mk b/editors/openoffice.org-3-devel/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread
diff --git a/editors/openoffice.org-3/files/patch-python-makefile.mk b/editors/openoffice.org-3/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread
diff --git a/editors/openoffice.org-vcltesttool/files/patch-python-makefile.mk b/editors/openoffice.org-vcltesttool/files/patch-python-makefile.mk
new file mode 100644
index 000000000000..6308ab485a6f
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-python-makefile.mk
@@ -0,0 +1,11 @@
+--- ../python/makefile.mk	31 Jul 2003 12:15:14 -0000	1.5.2.2
++++ ../python/makefile.mk	8 Aug 2003 15:28:45 -0000
+@@ -187,7 +187,7 @@
+ 	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
+ .ELSE
+ .IF "$(OS)" == "FREEBSD"
+-	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
++	$(LINK) -shared -o $@ -Wl,-whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -Wl,-no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
+ .ELSE
+ .IF "$(OS)" == "IRIX"
+ 	ld -shared -o $@ -all $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -notall -soname libpython.so.$(PYMAJOR)  -lm -ldl -lc -lpthread