diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-03-23 17:14:57 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-03-23 17:14:57 +0000 |
| commit | a99dc21feeb501c6f11c666a8d2156e01f4f8e31 (patch) | |
| tree | 68442be01210c688f5892d0249cd903a05c8c225 /editors/openoffice.org-3-RC | |
| parent | The disposing happened to early. Move it a bit. (diff) | |
Use the linux map files for the gcc3 case.
Notes
Notes:
svn path=/head/; revision=77276
Diffstat (limited to 'editors/openoffice.org-3-RC')
3 files changed, 28 insertions, 6 deletions
diff --git a/editors/openoffice.org-3-RC/files/patch-jvmaccess+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-jvmaccess+util+makefile.mk new file mode 100644 index 000000000000..b0fac21d2ec9 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-jvmaccess+util+makefile.mk @@ -0,0 +1,11 @@ +--- ../jvmaccess/util/makefile.mk.orig Wed Mar 12 23:52:25 2003 ++++ ../jvmaccess/util/makefile.mk Wed Mar 12 23:52:50 2003 +@@ -90,6 +90,8 @@ + SHL1VERSIONMAP = cc5_solaris_sparc.map + .ELIF "$(OS)$(CPU)$(COMNAME)" == "LINUXIgcc3" + SHL1VERSIONMAP = gcc3_linux_intel.map ++.ELIF "$(OS)$(CPU)$(COMNAME)" == "FREEBSDIgcc3" ++SHL1VERSIONMAP = gcc3_linux_intel.map + .ENDIF + + DEF1NAME = $(SHL1TARGET) diff --git a/editors/openoffice.org-3-RC/files/patch-sal+util+makefile.mk b/editors/openoffice.org-3-RC/files/patch-sal+util+makefile.mk new file mode 100644 index 000000000000..284f86f444b0 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-sal+util+makefile.mk @@ -0,0 +1,11 @@ +--- ../sal/util/makefile.mk.orig Wed Mar 12 23:57:03 2003 ++++ ../sal/util/makefile.mk Wed Mar 12 23:56:54 2003 +@@ -120,6 +120,8 @@ + + .IF "$(OS)"=="LINUX" + SHL1VERSIONMAP= gcc3_linux_intel.map ++.ELIF "$(OS)"=="FREEBSD" ++SHL1VERSIONMAP= gcc3_linux_intel.map + .ELSE + SHL1VERSIONMAP= $(TARGET).map + .ENDIF diff --git a/editors/openoffice.org-3-RC/files/patch-salhelper+source+makefile.mk b/editors/openoffice.org-3-RC/files/patch-salhelper+source+makefile.mk index 3687664d8d16..4b380cf2ac98 100644 --- a/editors/openoffice.org-3-RC/files/patch-salhelper+source+makefile.mk +++ b/editors/openoffice.org-3-RC/files/patch-salhelper+source+makefile.mk @@ -1,13 +1,13 @@ ---- ../salhelper/source/makefile.mk.orig Wed Nov 14 14:19:21 2001 -+++ ../salhelper/source/makefile.mk Sun Mar 3 17:58:15 2002 -@@ -109,6 +109,10 @@ +--- ../salhelper/source/makefile.mk.orig Sun Sep 1 18:22:39 2002 ++++ ../salhelper/source/makefile.mk Wed Mar 12 23:54:12 2003 +@@ -114,6 +114,10 @@ SHL1VERSIONMAP=lngi.map .ELIF "$(OS)$(CPU)$(COMNAME)"=="LINUXIgcc3" SHL1VERSIONMAP=gcc3_linux_intel.map +.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc2" -+SHL1VERSIONMAP=gcc2_freebsd_intel.map ++SHL1VERSIONMAP=gcc2_linux_intel.map +.ELIF "$(OS)$(CPU)$(COMNAME)"=="FREEBSDIgcc3" -+SHL1VERSIONMAP=gcc3_freebsd_intel.map ++SHL1VERSIONMAP=gcc3_linux_intel.map .ENDIF - + # --- Targets ------------------------------------------------------ |