diff options
Diffstat (limited to 'editors/openoffice.org-2.0/files/fbsd4-workaroundpatch')
| -rw-r--r-- | editors/openoffice.org-2.0/files/fbsd4-workaroundpatch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch b/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch index 414bb86c38b4..d69388828582 100644 --- a/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch +++ b/editors/openoffice.org-2.0/files/fbsd4-workaroundpatch @@ -40,33 +40,3 @@ diff -u -r1.5 makefile.mk SHL1STDLIBS= \ $(BFXMLOFFLIB) \ -######################################################################### -Issutracker : #i52984#, #i54178# -CWS : N/A -Author: : <yury_tarasievich@yahoo.com> <yury_t@openoffice.org> (JCA) -Description : -Workaround for FreeBSD4. For rsc/rscpp, -pthread is ignored although it is -specifled, so specified twice. it does solve the probem. this is redundant -for other FreeBSDs, I believe it is safe. otherwise rsc bombs like: -libstlport_gcc.so which claims `Undefined symbol "pthread_mutex_lock"'. - -Index: solenv/inc/unxfbsdi.mk -=================================================================== -RCS file: /cvs/tools/solenv/inc/unxfbsdi.mk,v -retrieving revision 1.17 -diff -u -r1.17 unxfbsdi.mk ---- solenv/inc/unxfbsdi.mk 18 Aug 2005 12:04:47 -0000 1.17 -+++ solenv/inc/unxfbsdi.mk 3 Sep 2005 11:10:07 -0000 -@@ -217,8 +217,10 @@ - - LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - --LIBSTLPORT=$(DYNAMIC) -lstlport_gcc --LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) -+# Workaround for FreeBSD4. In some case $(PTHREAD_LIBS), namely -pthread -+# is ignored although it is specifled. This is redundant for other FreeBSDs. -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc $(PTHREAD_LIBS) -+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS) - - #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) - |