[ooo-build-commit] Branch 'ooo/master' - 3 commits - berkeleydb/makefile.mk cairo/cairo cairo/pixman dictionaries/fr_FR hunspell/makefile.mk icu/makefile.mk libxml2/libxml2-2.6.31.patch libxml2/makefile.mk libxml2/prj libxslt/makefile.mk
Jan Holesovsky
kendy at kemper.freedesktop.org
Wed Sep 16 18:20:47 PDT 2009
berkeleydb/makefile.mk | 6 ++++--
cairo/cairo/makefile.mk | 4 +++-
cairo/pixman/makefile.mk | 6 +++---
dictionaries/fr_FR/dictionaries.xcu | 2 +-
hunspell/makefile.mk | 4 +++-
icu/makefile.mk | 1 +
libxml2/libxml2-2.6.31.patch | 2 +-
libxml2/makefile.mk | 6 +++---
libxml2/prj/build.lst | 2 +-
libxslt/makefile.mk | 6 +++---
10 files changed, 23 insertions(+), 16 deletions(-)
New commits:
commit fa35a04bc5b68b31b213b9780e6de40ceed06f06
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Wed Sep 16 14:49:32 2009 +0000
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
diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index fd9f4d7..5b99d62 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 a40467f..dd2300e 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 1eed520..c48f80c 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 db667cc..f7e17c9 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 71e2c91..7503a4c 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=;
commit bcb00cb55e528f80dd8e14f457f9a80f20509244
Author: Jens-Heiner Rechtien <hr at openoffice.org>
Date: Wed Sep 16 14:37:52 2009 +0000
CWS-TOOLING: integrate CWS sb113
2009-09-01 sb #i76393# second attempt at properly #ifdef-ing previous HG commit d598efdbf012
2009-08-28 sb #i102469# change back <T extends XInterface> to just <T> on queryInterface, to avoid binary incompatibility (method changing its signature from (Ljava/lang/Class;Ljava/lang/Object;)Ljava/lang/Object; to (Ljava/lang/Class;Ljava/lang/Object;)Lcom/sun/star/uno/XInterface;)
2009-08-28 sb #i76393# properly #ifdef previous HG commit d598efdbf012
2009-08-27 sb #i94421# work around compiler error (based on a patch supplied by cloph)
2009-08-26 sb merged in DEV300_m56
2009-08-26 sb #i76393# on Linux, include dynamic section offset in crash report so as to be able to map "prelinked" callstacks back to original (patch by cmc)
2009-08-26 sb #i88162# remove unnecessary whitespace lines from per-locale xcu files (patch by tora)
2009-08-17 Juergen Schmidt #i104292# set context classloader after create new custom UNO loader
2009-08-17 Juergen Schmidt #i103749# integrate patch
2009-08-14 sb #i103269# cherry-picked ssh://hg@hg.services.openoffice.org/cws/sb111 -r 5124ebd5edd1 ("#i101955# changed encoding of XML file content from erroneous ISO-8859-1 to UTF-8")
2009-08-12 sb #i102469# fixed mis-applications of UnoRuntime.queryInterface (detected via the simplified UnoRuntime.queryInterface, the HG changeset 29de35fc9554) to use AnyConverter instead; changed qadevOOo's lib.MultiMethodTest.before to allow throwing arbitrary exceptions, to cater for IllegalArgumentException thrown by AnyConverter
2009-08-12 sb #i104178# drop extra libxml2-config script from libxmlsec
2009-08-10 sb #i101754# simplified osl_getProcessInfo for LINUX (patch by cmc)
2009-08-10 sb #i95018# avoid closing -1 fds (patch supplied by cmc)
2009-08-10 sb #i103585# removed (apparently unnecessary) zlib support from libxml2; in turn, removed zlib dependencies from libxmlsec, libxslt, and redland (assuming those were transitive dependencies brought in by direct dependencies on libxml2)
2009-08-10 sb #i102469# simplified UnoRuntime.queryInterface using Java 5 generics; adapted URE-related modules accordingly
2009-08-10 sb #i101213# adapted setsolar env (solenv/config/) to set PYTHONPATH (and not set PYTHONHOME) in accordance with configure env (set_soenv.in); fixed testtools/source/bridgetest/pyuno (which now should work everywhere out of the box, thanks to the fixed setsolar PYTHONPATH)
2009-08-10 sb cherry-picked ssh://hg@hg.services.openoffice.org/cws/sb111 -r ea8de6d9396b ("#i101955# work in progress for a .hgignore file, continued")
diff --git a/dictionaries/fr_FR/dictionaries.xcu b/dictionaries/fr_FR/dictionaries.xcu
index 78c5b80..9540877 100755
--- a/dictionaries/fr_FR/dictionaries.xcu
+++ b/dictionaries/fr_FR/dictionaries.xcu
@@ -2,7 +2,7 @@
<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Linguistic" oor:package="org.openoffice.Office">
<node oor:name="ServiceManager">
<node oor:name="Dictionaries">
- <node oor:name="HunSpellDic_fr_FR-Classique-et-Réforme1990" oor:op="fuse">
+ <node oor:name="HunSpellDic_fr_FR-Classique-et-Réforme1990" oor:op="fuse">
<prop oor:name="Locations" oor:type="oor:string-list">
<value>%origin%/fr_FR.aff %origin%/fr_FR.dic</value>
</prop>
diff --git a/libxml2/libxml2-2.6.31.patch b/libxml2/libxml2-2.6.31.patch
index cba8f23..31fcf72 100644
--- a/libxml2/libxml2-2.6.31.patch
+++ b/libxml2/libxml2-2.6.31.patch
@@ -165,7 +165,7 @@
;;
--libs)
-! echo -L${libdir} ${LIBXML2LIB} ${ZLIB3RDLIB} -lm
+! echo -L${libdir} ${LIBXML2LIB} -lm
! # if [ "`uname`" = "Linux" ]
! # then
! # if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = "-L/usr/lib64" ]
diff --git a/libxml2/makefile.mk b/libxml2/makefile.mk
index b99c52f..a9c2336 100644
--- a/libxml2/makefile.mk
+++ b/libxml2/makefile.mk
@@ -70,7 +70,7 @@ xml2_LIBS+=-lstdc++_s
.ENDIF
CONFIGURE_DIR=
CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP="$(WRAPCMD) objdump"
+CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --without-debug --build=i586-pc-mingw32 --host=i586-pc-mingw32 lt_cv_cc_dll_switch="-shared" CC="$(xml2_CC)" CFLAGS=-D_MT LDFLAGS="-no-undefined -Wl,--enable-runtime-pseudo-reloc -L$(ILIB:s/;/ -L/)" LIBS="$(xml2_LIBS)" OBJDUMP="$(WRAPCMD) objdump"
BUILD_ACTION=$(GNUMAKE)
BUILD_DIR=$(CONFIGURE_DIR)
.ELSE
@@ -99,10 +99,10 @@ xml2_LDFLAGS+=-Wl,-z,noexecstack
CONFIGURE_DIR=
.IF "$(OS)"=="OS2"
CONFIGURE_ACTION=sh .$/configure
-CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=yes --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
+CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=yes --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS)" CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
.ELSE
CONFIGURE_ACTION=.$/configure
-CONFIGURE_FLAGS=--enable-ipv6=no --without-python --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
+CONFIGURE_FLAGS=--enable-ipv6=no --without-python --without-zlib --enable-static=no --with-sax1=yes ADDCFLAGS="$(xml2_CFLAGS) $(EXTRA_CFLAGS)" LDFLAGS="$(xml2_LDFLAGS) $(EXTRA_LINKFLAGS)"
.ENDIF
BUILD_ACTION=$(GNUMAKE)
BUILD_FLAGS+= -j$(EXTMAXPROCESS)
diff --git a/libxml2/prj/build.lst b/libxml2/prj/build.lst
index 16c0b0d..01d9b3f 100644
--- a/libxml2/prj/build.lst
+++ b/libxml2/prj/build.lst
@@ -1,3 +1,3 @@
-lx libxml2 : soltools ZLIB:zlib NULL
+lx libxml2 : soltools NULL
lx libxml2 usr1 - all lx_mkout NULL
lx libxml2 nmake - all lx_libxml2 NULL
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index e286968..4569a18 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -104,7 +104,6 @@ LDFLAGS+:=-L$(SOLARLIBDIR) -L$(SYSBASE)$/lib -L$(SYSBASE)$/usr$/lib -lpthread -l
.EXPORT: CPPFLAGS
.EXPORT: LDFLAGS
.EXPORT: LIBXML2LIB
-.EXPORT: ZLIB3RDLIB
.IF "$(COMNAME)"=="sunpro5"
CPPFLAGS+:=$(ARCH_FLAGS) -xc99=none
commit 72e923d398fcddeddea05fb967e9bd05dd0274e0
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Wed Sep 16 11:45:54 2009 +0000
CWS-TOOLING: integrate CWS l10nframework01
diff --git a/libxslt/makefile.mk b/libxslt/makefile.mk
index ba335ee..e286968 100644
--- a/libxslt/makefile.mk
+++ b/libxslt/makefile.mk
@@ -46,6 +46,8 @@ all:
# --- Files --------------------------------------------------------
+.IF "$(L10N_framework)"==""
+
.INCLUDE : libxsltversion.mk
LIBXSLTVERSION=$(LIBXSLT_MAJOR).$(LIBXSLT_MINOR).$(LIBXSLT_MICRO)
@@ -54,7 +56,6 @@ TARFILE_NAME=$(PRJNAME)-$(LIBXSLTVERSION)
PATCH_FILES=$(TARFILE_NAME).patch $(TARFILE_NAME)_win_manifest.patch
# This is only for UNX environment now
-
.IF "$(OS)"=="WNT"
.IF "$(COM)"=="GCC"
xslt_CC=$(CC)
@@ -144,7 +145,7 @@ OUT2BIN+=xslt-config
.ENDIF
# --- Targets ------------------------------------------------------
-
+.ENDIF # L10N_framework
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
More information about the ooo-build-commit
mailing list