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
637 B
Plaintext
22 lines
637 B
Plaintext
$OpenBSD: patch-solenv_inc_settings_mk,v 1.3 2009/05/08 15:43:50 robert Exp $
|
|
--- solenv/inc/settings.mk.orig.port Tue Dec 9 10:43:20 2008
|
|
+++ solenv/inc/settings.mk Thu May 7 23:14:17 2009
|
|
@@ -1109,6 +1109,8 @@ CDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
|
|
RSCDEFS+=-DOSL_DEBUG_LEVEL=$(DBG_LEVEL)
|
|
.ENDIF
|
|
|
|
+CFLAGS+= $(ENVCFLAGS)
|
|
+
|
|
.IF "$(optimize)"!=""
|
|
CDEFS+=$(CDEFSOPT)
|
|
CFLAGS+=$(CFLAGSOPT)
|
|
@@ -1237,7 +1239,7 @@ CFLAGSAPPEND+=$(ENVWARNFLAGS)
|
|
|
|
CDEFS+= $(ADDCDEFS)
|
|
CDEFS+= $(ENVCDEFS)
|
|
-CFLAGS+= $(CFLAGSCALL) $(ENVCFLAGS)
|
|
+CFLAGS+= $(CFLAGSCALL)
|
|
CFLAGSCXX+= $(ENVCFLAGSCXX)
|
|
# andersrum wg. -TPxxxx
|
|
CFLAGSINCXX+:=$(ENVCFLAGSINCXX)
|