diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2005-06-03 05:06:04 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2005-06-03 05:06:04 +0000 |
| commit | 8d64d89d73da265e7525fb814a21c81a929f19e4 (patch) | |
| tree | 8c20f286d56d751272825fbbb25d3f70618ca916 /editors/openoffice.org-2 | |
| parent | 3bd4a605ca8355ab28a27b033e4992a8199b3a20 (diff) | |
Notes
Diffstat (limited to 'editors/openoffice.org-2')
| -rw-r--r-- | editors/openoffice.org-2/files/patch-vcl+util | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/editors/openoffice.org-2/files/patch-vcl+util b/editors/openoffice.org-2/files/patch-vcl+util deleted file mode 100644 index 602e48928ad0..000000000000 --- a/editors/openoffice.org-2/files/patch-vcl+util +++ /dev/null @@ -1,50 +0,0 @@ -Issutracker : #i49686# -CWS : N/A -Author : NAKATA Maho <maho@openoffice.org> (JCA) -Description : Get rid of -ldl for FREEBSD and MACOSX - -Index: vcl/util/makefile.mk -=================================================================== -RCS file: /cvs/gsl/vcl/util/makefile.mk,v -retrieving revision 1.65 -diff -u -r1.65 makefile.mk ---- vcl/util/makefile.mk 13 Jan 2005 18:16:05 -0000 1.65 -+++ vcl/util/makefile.mk 7 Apr 2005 01:29:29 -0000 -@@ -252,10 +252,11 @@ - - .IF "$(GUI)"=="UNX" - --.IF "$(OS)"=="MACOSX" --SHL1STDLIBS += -ldl -+.IF "$(OS)"!="MACOSX" && "$(OS)"!="FREEBSD" -+SHL1STDLIBS+= -ldl - .ENDIF - -+ - .IF "$(GUIBASE)"=="aqua" - SHL1STDLIBS += -framework Cocoa - .ENDIF -@@ -383,7 +384,11 @@ - - - SHL4STDLIBS+=-l$(SHL2TARGET) -+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" -+SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -+.ELSE - SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX" - .ENDIF # "$(ENABLE_GTK)" != "" - - # KDE plugin -@@ -396,7 +401,11 @@ - # libs for KDE plugin - SHL5STDLIBS=$(KDE_LIBS) - SHL5STDLIBS+=-l$(SHL2TARGET) -+.IF "$(OS)"=="FREEBSD" || "$(OS)"=="MACOSX" -+SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -+.ELSE - SHL5STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl -+.ENDIF # "$(OS)"!="FREEBSD" || "$(OS)"!="MACOSX" - .ENDIF # "$(ENABLE_KDE)" != "" - - .ENDIF # UNX |