CWS-TOOLING: integrate CWS cloph13

2009-09-01  #i104566# also use syslibroot/isysroot for external components
2009-08-28  #i104568# clean up duplicated definitions of OBJCXXFLAGS
2009-08-28  #i104567# add ccache-detection to configure (to skip to objcxx-flags)
2009-08-28  #i104566# use Mac OS X 10.4-SDK to ensure backwards compatibility
use MACOSX_DEPLOYMENT_TARGET and sysroot/syslibroot switches
ignore "-isysroot /Developer/..." arguments for OOo's cpp

5 files changed, 14 insertions, 7 deletions

diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index fd9f4d7f1b64..5b99d6286fcc 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -40,7 +40,7 @@ TARGET=so_berkeleydb
 
 .IF "$(SYSTEM_DB)" == "YES"
 all:
-        @echo "An already available installation of db should exist on your system."
+    @echo "An already available installation of db should exist on your system."
     @echo "Therefore the version provided here does not need to be built in addition."
 .ENDIF
 
@@ -102,7 +102,9 @@ CONFIGURE_DIR=out
 CONFIGURE_ACTION= \
     ..$/dist$/configure
 CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --enable-compat185
-
+.IF "$(OS)"=="MACOSX"
+CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
+.ENDIF
 # just pass ARCH_FLAGS to native build
 CFLAGS+:=$(ARCH_FLAGS)
 CXXFLAGS+:=$(ARCH_FLAGS)
diff --git a/cairo/cairo/makefile.mk b/cairo/cairo/makefile.mk
index a40467f03fe0..dd2300eaa8d1 100644
--- a/cairo/cairo/makefile.mk
+++ b/cairo/cairo/makefile.mk
@@ -41,7 +41,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 .IF  "$(ENABLE_CAIRO)" == ""
 all:
-        @echo "Nothing to do (Cairo not enabled)."
+    @echo "Nothing to do (Cairo not enabled)."
 
 .ELIF "$(SYSTEM_CAIRO)" == "YES"
 all:
@@ -113,6 +113,8 @@ cairo_CPPFLAGS+=$(EXTRA_CFLAGS) $(EXTRA_CDEFS)
 CONFIGURE_DIR=
 CONFIGURE_ACTION=cp $(SRC_ROOT)$/$(PRJNAME)$/cairo$/dummy_pkg_config . && .$/configure
 CONFIGURE_FLAGS=--enable-static=no --disable-xlib --disable-ft --disable-svg --disable-png --enable-quartz --enable-quartz-font --enable-gtk-doc=no --enable-test-surfaces=no PKG_CONFIG=./dummy_pkg_config ZLIB3RDLIB=$(ZLIB3RDLIB) COMPRESS=$(cairo_COMPRESS)
+cairo_CPPFLAGS+=$(EXTRA_CDEFS)
+cairo_LDFLAGS+=$(EXTRA_LINKFLAGS)
 BUILD_ACTION=$(GNUMAKE)
 BUILD_FLAGS+= -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
diff --git a/cairo/pixman/makefile.mk b/cairo/pixman/makefile.mk
index 1eed5207de86..c48f80c2da49 100644
--- a/cairo/pixman/makefile.mk
+++ b/cairo/pixman/makefile.mk
@@ -41,11 +41,11 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 .IF  "$(ENABLE_CAIRO)" == ""
 all:
-        @echo "Nothing to do (Cairo not enabled)."
+    @echo "Nothing to do (Cairo not enabled)."
 
 .ELIF "$(BUILD_PIXMAN)" == ""
 all:
-       @echo "Not building pixman."
+    @echo "Not building pixman."
 
 .ENDIF
 
@@ -81,7 +81,7 @@ BUILD_ACTION=$(GNUMAKE) -f Makefile.win32
 # ----------- Native Mac OS X (Aqua/Quartz) --------------------------------
 CONFIGURE_DIR=
 CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no
+CONFIGURE_FLAGS=--enable-static=yes --enable-shared=no CPPFLAGS="$(EXTRA_CDEFS)"
 .IF "$(SYSBASE)"!=""
 .IF "$(EXTRA_CFLAGS)"!=""
 CONFIGURE_FLAGS+=CFLAGS="$(EXTRA_CFLAGS) $(EXTRA_CDEFS)"
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index db667cc038d2..f7e17c9dad0c 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -62,8 +62,10 @@ CONFIGURE_FLAGS+= CFLAGS=-xc99=none
 .IF "$(SYSBASE)"!=""
 .IF "$(EXTRA_CFLAGS)"!=""
 CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)"
-.ENDIF # "$(SYSBASE)"!=""
 .ENDIF # "$(EXTRA_CFLAGS)"!=""
+.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""
+CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
+.ENDIF
 
 BUILD_ACTION=make && make check
 
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 71e2c911fc80..7503a4c18dbc 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -86,6 +86,7 @@ icu_LDFLAGS+=-Wl,-z,noexecstack
 .ENDIF
 
 icu_CFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
+icu_LDFLAGS+=$(EXTRA_LINKFLAGS)
 icu_CXXFLAGS+=-O $(ARCH_FLAGS) $(EXTRA_CDEFS)
 
 BUILD_ACTION_SEP=;