diff options
Diffstat (limited to 'editors/openoffice-3/files/patch-i65514')
| -rw-r--r-- | editors/openoffice-3/files/patch-i65514 | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/editors/openoffice-3/files/patch-i65514 b/editors/openoffice-3/files/patch-i65514 index 3a7cabaad912..f12266b5fede 100644 --- a/editors/openoffice-3/files/patch-i65514 +++ b/editors/openoffice-3/files/patch-i65514 @@ -1,13 +1,12 @@ ---- berkeleydb/makefile.mk 25 May 2007 10:48:51 -0000 1.40 -+++ berkeleydb/makefile.mk 2 Jul 2007 20:15:24 -0000 -@@ -105,6 +105,10 @@ +--- berkeleydb/makefile.mk 2009-09-26 08:52:35.000000000 +0900 ++++ berkeleydb/makefile.mk 2009-09-26 08:54:31.000000000 +0900 +@@ -102,6 +102,9 @@ + CONFIGURE_ACTION= \ ..$/dist$/configure CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185 - -+.IF "$(COM)$(CPU)"=="GCCX" ++.IF "$(OS)"==FREEBSD && "$(COM)$(CPU)"=="GCCX" +CONFIGURE_FLAGS+=--with-mutex=x86/gcc-assembly +.ENDIF -+ - # just pass ARCH_FLAGS to native build - CFLAGS+:=$(ARCH_FLAGS) - CXXFLAGS+:=$(ARCH_FLAGS) + .IF "$(OS)"=="MACOSX" + CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)" + .ENDIF |