diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-09-04 04:58:44 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-09-04 04:58:44 +0000 |
| commit | af6fbb8207fd5f5cc6da60838966a2642a33309d (patch) | |
| tree | c2fa7eafde820df83bdba497f5f38fa33a2adf9f /editors/openoffice.org-1.0/files | |
| parent | Update to 2.35 (diff) | |
Add a workaround for 4.11-RELEASE. now buildable.
Inspired by: Yuri Tarasievich <yury_tarasievich@yahoo.com>
Notes
Notes:
svn path=/head/; revision=141876
Diffstat (limited to 'editors/openoffice.org-1.0/files')
| -rw-r--r-- | editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk index e2fe57952517..9213811f8e55 100644 --- a/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-1.0/files/patch-solenv+inc+unxfbsdi.mk @@ -84,7 +84,7 @@ diff -u -r1.4.4.1 unxfbsdi.mk +#LINKOUTPUT_FILTER=" |& $(SOLARENV)$/bin$/msg_filter" + +# options for C and C++ Compiler -+CDEFS+=-DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=400 -DOSVERSION=$(OSVERSION) $(PTHREAD_CFLAGS) ++CDEFS+=-DX86 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450 -DOSVERSION=$(OSVERSION) $(PTHREAD_CFLAGS) + +# this is a platform with JAVA support +.IF "$(SOLAR_JAVA)"!="" @@ -250,9 +250,9 @@ diff -u -r1.4.4.1 unxfbsdi.mk +STDSHLCUIMT=$(PTHREAD_LIBS) -lm +STDSHLGUIST=-lX11 -lXext -lm +STDSHLCUIST=-lm -+ -+LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++ -+LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) ++# adding $(PTHREAD_LIBS) is just a workaround for FreeBSD 4. no side effects for othre FreeBSDs. ++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++ $(PTHREAD_LIBS) ++LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC) $(PTHREAD_LIBS) + +#FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC) + |