diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2004-04-09 23:16:42 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2004-04-09 23:16:42 +0000 |
| commit | 7c36a935776badded5c66cf0d9c4cb60212675ed (patch) | |
| tree | 978b41f22b807427d0473d17ced00b94c688234e /editors/openoffice.org-2-RC/files/patch-vcl+util+makefile.mk | |
| parent | - Fix the package when GPT_LOCATION is not set during install (diff) | |
Update to cws_src680_ooo20040329, checked out at 20040402
Notes
Notes:
svn path=/head/; revision=106619
Diffstat (limited to '')
| -rw-r--r-- | editors/openoffice.org-2-RC/files/patch-vcl+util+makefile.mk | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/editors/openoffice.org-2-RC/files/patch-vcl+util+makefile.mk b/editors/openoffice.org-2-RC/files/patch-vcl+util+makefile.mk new file mode 100644 index 000000000000..5d133486e032 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-vcl+util+makefile.mk @@ -0,0 +1,30 @@ +FreeBSD doesn't require/need/have -ldl +http://qa.openoffice.org/issues/show_bug.cgi?id=27043 + +--- ../vcl/util/makefile.mk~ Mon Mar 29 09:50:51 2004 ++++ ../vcl/util/makefile.mk Mon Mar 29 10:19:04 2004 +@@ -208,7 +208,9 @@ + .IF "$(GUI)"!="UNX" + SHL1OBJS= $(SLO)$/salshl.obj + .ELSE +-SHL1STDLIBS+=-ldl ++ .IF "$(OS)"!="FREEBSD" ++ SHL1STDLIBS+=-ldl ++ .ENDIF + .ENDIF + + .IF "$(GUI)" != "MAC" +@@ -351,8 +353,11 @@ + # libs for gtk plugin + SHL4STDLIBS=`pkg-config --libs gtk+-2.0 gthread-2.0` + SHL4STDLIBS+=-l$(SHL2TARGET) +-SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl +- ++ .IF "$(OS)"!="FREEBSD" ++ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 -ldl ++ .ELSE ++ SHL4STDLIBS+=$(SHL3STDLIBS) -lX11 ++ .ENDIF # FREEBSD + .ENDIF # UNX + + # --- Allgemein ---------------------------------------------------------- |