robert 63e78dd49d update to openoffice 3.0.1rc1;
this now builds with gcc4
2009-01-22 17:44:38 +00:00

22 lines
803 B
Plaintext

$OpenBSD: patch-solenv_inc_libs_mk,v 1.2 2009/01/22 17:44:39 robert Exp $
--- solenv/inc/libs.mk.orig.port Fri Aug 1 08:48:17 2008
+++ solenv/inc/libs.mk Thu Jan 22 10:30:40 2009
@@ -204,7 +204,7 @@ ZLIB3RDLIB=-lz
ZLIB3RDLIB=-lzlib
.ENDIF
.IF "$(SYSTEM_JPEG)"=="YES"
-.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX"
+.IF "$(SOLAR_JAVA)" != "" && "$(JDK)" != "gcj" && "$(OS)" != "MACOSX" && "$(OS)" != "OPENBSD"
#i34482# Blackdown/Sun jdk is in the libsearch patch and has a libjpeg :-(
.IF "$(OS)" == "FREEBSD"
JPEG3RDLIB=/usr/local/lib/libjpeg.so
@@ -332,7 +332,7 @@ USED_RCLIENT_LIBS = $(VCLLIB) $(SOTLIB) $(TOOLSLIB) \
SABLOT3RDLIB=-lsablot
APP3RDLIB=-lapp
SAMPLE3RDLIB=-lsample
-HNJLIB*=-lhyphen
+#HNJLIB*=-lhyphen
MYSPELLLIB=-lmyspell
COSVLIB=-lcosv
UDMLIB=-ludm