diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-03-16 17:02:10 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-03-16 17:02:10 +0000 |
| commit | b51761e90df404f959c81058983d47771aba77a5 (patch) | |
| tree | b6f97421bc65e75282003d975a6cd50f73bfdeaf /editors/openoffice.org-2 | |
| parent | rm -> ${RM} (diff) | |
Revert the last change. It looks like -fno-rtti is only needed for the
mozilla part, and else it breaks the build where -rtti is used. Add a new
patch to change it for the mozilla build.
Notes
Notes:
svn path=/head/; revision=56212
Diffstat (limited to 'editors/openoffice.org-2')
5 files changed, 41 insertions, 2 deletions
diff --git a/editors/openoffice.org-2/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-2/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk new file mode 100644 index 000000000000..27086ca55940 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk @@ -0,0 +1,13 @@ +--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Fri Mar 15 19:10:28 2002 ++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Fri Mar 15 19:11:45 2002 +@@ -152,6 +152,10 @@ + -Wno-long-long -pthread + CDEFS += -DTRACING + .ENDIF ++.IF "$(OS)" == "FREEBSD" ++CFLAGSCXX += \ ++ -fno-rtti ++.ENDIF + .ENDIF + + SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR) diff --git a/editors/openoffice.org-2/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk b/editors/openoffice.org-2/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk new file mode 100644 index 000000000000..27086ca55940 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk @@ -0,0 +1,13 @@ +--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Fri Mar 15 19:10:28 2002 ++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Fri Mar 15 19:11:45 2002 +@@ -152,6 +152,10 @@ + -Wno-long-long -pthread + CDEFS += -DTRACING + .ENDIF ++.IF "$(OS)" == "FREEBSD" ++CFLAGSCXX += \ ++ -fno-rtti ++.ENDIF + .ENDIF + + SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR) diff --git a/editors/openoffice.org-2/files/patch-mozillasrc::makefile.mk b/editors/openoffice.org-2/files/patch-mozillasrc::makefile.mk new file mode 100644 index 000000000000..27086ca55940 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-mozillasrc::makefile.mk @@ -0,0 +1,13 @@ +--- ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk.orig Fri Mar 15 19:10:28 2002 ++++ ../connectivity/source/drivers/mozab/mozillasrc/makefile.mk Fri Mar 15 19:11:45 2002 +@@ -152,6 +152,10 @@ + -Wno-long-long -pthread + CDEFS += -DTRACING + .ENDIF ++.IF "$(OS)" == "FREEBSD" ++CFLAGSCXX += \ ++ -fno-rtti ++.ENDIF + .ENDIF + + SHL1TARGET_NAME=$(TARGET)$(MOZAB_MAJOR) diff --git a/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk index 8a49dcd3175e..ab5e980366fb 100644 --- a/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-2/files/patch-solenv+inc+unxfbsdi.mk @@ -42,7 +42,7 @@ + +# flags for the C++ Compiler +CFLAGSCC=-pipe -g -+CFLAGSCXX=-pipe -fno-for-scope -fpermissive -fno-rtti ++CFLAGSCXX=-pipe -fno-for-scope -fpermissive + +# Flags for enabling exception handling +CFLAGSEXCEPTIONS=-fexceptions diff --git a/editors/openoffice.org-2/files/patch-solenv::inc::unxfbsdi.mk b/editors/openoffice.org-2/files/patch-solenv::inc::unxfbsdi.mk index ffd2383a3a70..f4d271722670 100644 --- a/editors/openoffice.org-2/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice.org-2/files/patch-solenv::inc::unxfbsdi.mk @@ -36,7 +36,7 @@ + +# flags for the C++ Compiler +CFLAGSCC=-pipe -g -+CFLAGSCXX=-pipe -fno-for-scope -fpermissive -fno-rtti ++CFLAGSCXX=-pipe -fno-for-scope -fpermissive + +# Flags for enabling exception handling +CFLAGSEXCEPTIONS=-fexceptions |