diff options
author | Martin Blapp <mbr@FreeBSD.org> | 2002-04-02 23:48:28 +0000 |
---|---|---|
committer | Martin Blapp <mbr@FreeBSD.org> | 2002-04-02 23:48:28 +0000 |
commit | a31c45a0b4b17f5d096eed1898c2707ee051cbfc (patch) | |
tree | 9c56cf569b60a5bc10df486b70071e922ead482f /editors/openoffice-1.0/files/patch-product+util+makefile.mk | |
parent | Fix cups support. (diff) |
Upgrade to build 641d. More work is necessary to make the build compile.
There are still at least two different gcc bugs in our compiler, one
issue has already been found by Alexander Kabaev <ak03@gte.com>. He's
working on fixing the other.
Notes
Notes:
svn path=/head/; revision=57248
Diffstat (limited to 'editors/openoffice-1.0/files/patch-product+util+makefile.mk')
-rw-r--r-- | editors/openoffice-1.0/files/patch-product+util+makefile.mk | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/editors/openoffice-1.0/files/patch-product+util+makefile.mk b/editors/openoffice-1.0/files/patch-product+util+makefile.mk index 919c2b2e2fad..fb3c8af3e2b2 100644 --- a/editors/openoffice-1.0/files/patch-product+util+makefile.mk +++ b/editors/openoffice-1.0/files/patch-product+util+makefile.mk @@ -1,6 +1,6 @@ ---- ../product/util/makefile.mk.orig Mon Dec 17 18:15:54 2001 -+++ ../product/util/makefile.mk Sun Mar 10 23:18:09 2002 -@@ -117,6 +117,15 @@ +--- ../product/util/makefile.mk.orig Mon Mar 11 17:09:13 2002 ++++ ../product/util/makefile.mk Wed Apr 3 00:40:40 2002 +@@ -157,6 +157,15 @@ STLPORTLIBNAME=stlport_vc6.dll ADDITIONAL_DLLS= \ $(DESTDIRDLL)$/w9xucwrp.dll @@ -16,18 +16,7 @@ .ENDIF STLPORTDEST=$(DESTDIRDLL)$/$(STLPORTLIBNAME) -@@ -373,8 +382,8 @@ - $(GNUCOPY) -p $(DLLOUT)$/$(@:f) $@ - - $(DESTDIRDLL)$/%$(MY_VERSION_LINKPOSTFIX) : $(DESTDIRDLL)$/%$(MY_VERSION_DLLPOSTFIX) $(DIRLIST) -- +ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@ -- +ln -s $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db) -+ +ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $@ -+ +ln -fs $(@:f)$(MY_VERSION_LINKTARGETPOSTFIX) $(@:db) - - - #--------------------------------------------------------- -@@ -385,7 +394,7 @@ +@@ -428,7 +437,7 @@ $(DESTDIRDLL)$/libstdc++.so.3 : $(DESTDIRDLL)$/libstdc++.so.3.0.1 $(DIRLIST) -rm -f $@ @@ -36,7 +25,7 @@ $(DESTDIRDLL)$/libgcc_s.so.1 : $(DLLOUT)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ -@@ -393,7 +402,7 @@ +@@ -436,7 +445,7 @@ $(DESTDIRDLL)$/libgcc_s.so : $(DESTDIRDLL)$/libgcc_s.so.1 $(DIRLIST) -rm -f $@ |