2e1e7acb0e
- introduce a no_java flavor because now we can build OOo w/o having jdk and other java dependencies installed - introduce a parallel flavor that allows people to build OOo with parallel processes. to achieve this we use a so called "non-blocking" cat, so another distfile has been added in order two provide to pre-built static binaries with the needed modifications (for amd64 and i386) By default we run a parallel build with NCPU+1 processes. - remove unneccessary patch files - fix some dependencies
22 lines
803 B
Plaintext
22 lines
803 B
Plaintext
$OpenBSD: patch-solenv_inc_libs_mk,v 1.3 2009/05/08 15:43:50 robert Exp $
|
|
--- solenv/inc/libs.mk.orig.port Tue Feb 17 18:58:18 2009
|
|
+++ solenv/inc/libs.mk Thu May 7 23:14:17 2009
|
|
@@ -210,7 +210,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
|
|
@@ -338,7 +338,7 @@ USED_RCLIENT_LIBS = $(VCLLIB) $(SOTLIB) $(TOOLSLIB) \
|
|
SABLOT3RDLIB=-lsablot
|
|
APP3RDLIB=-lapp
|
|
SAMPLE3RDLIB=-lsample
|
|
-HNJLIB*=-lhyphen
|
|
+#HNJLIB*=-lhyphen
|
|
MYSPELLLIB=-lmyspell
|
|
COSVLIB=-lcosv
|
|
UDMLIB=-ludm
|