diff options
| author | mbr <mbr@FreeBSD.org> | 2002-03-16 17:02:10 +0000 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2002-03-16 17:02:10 +0000 |
| commit | 7511539a5286c744fb2879432093b7ed14a27cce (patch) | |
| tree | ac0dc299ed86a3f9ba434c050bb382295a43ed38 /editors/openoffice.org-2.0-devel | |
| parent | 2729e23c0d45ebe6a50ed9497c184bd4f3823e01 (diff) | |
| download | FreeBSD-ports-7511539a5286c744fb2879432093b7ed14a27cce.zip FreeBSD-ports-7511539a5286c744fb2879432093b7ed14a27cce.tar.gz | |
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.
Diffstat (limited to 'editors/openoffice.org-2.0-devel')
5 files changed, 41 insertions, 2 deletions
diff --git a/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-connectivity+source+drivers+mozab+mozillasrc+makefile.mk new file mode 100644 index 0000000..27086ca --- /dev/null +++ b/editors/openoffice.org-2.0-devel/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.0-devel/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-connectivity::source::drivers::mozab::mozillasrc::makefile.mk new file mode 100644 index 0000000..27086ca --- /dev/null +++ b/editors/openoffice.org-2.0-devel/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.0-devel/files/patch-mozillasrc::makefile.mk b/editors/openoffice.org-2.0-devel/files/patch-mozillasrc::makefile.mk new file mode 100644 index 0000000..27086ca --- /dev/null +++ b/editors/openoffice.org-2.0-devel/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.0-devel/files/patch-solenv+inc+unxfbsdi.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk index 8a49dcd..ab5e980 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-solenv+inc+unxfbsdi.mk +++ b/editors/openoffice.org-2.0-devel/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.0-devel/files/patch-solenv::inc::unxfbsdi.mk b/editors/openoffice.org-2.0-devel/files/patch-solenv::inc::unxfbsdi.mk index ffd2383..f4d2717 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-solenv::inc::unxfbsdi.mk +++ b/editors/openoffice.org-2.0-devel/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 |
