[Libreoffice-commits] .: 3 commits - berkeleydb/makefile.mk configure.in i18nutil/prj

[Stephan Bergmann]

 berkeleydb/makefile.mk |    5 ++---
 configure.in           |    4 ++--
 i18nutil/prj/build.lst |    2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 6e4f2f6f0dad303f13ea3b1a5e527030406a3756
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 26 14:46:09 2011 +0200

    Fixed "no --enable-dbgutil for MSVC" check.

diff --git a/configure.in b/configure.in
index 5468787..9700de9 100644
--- a/configure.in
+++ b/configure.in
@@ -2312,8 +2312,8 @@ if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
     # causes too many compilation errors. After having spent some
     # months slowly fixing them one by one, having reached sw, I give
     # up. Feel free to try again.
-    if test $_os = WINNT; then
-        AC_MSG_ERROR([Sorry, --enable-dgutil won't work with MSVC])
+    if test "$_os" = WINNT -a "$WITH_MINGW" != yes; then
+        AC_MSG_ERROR([Sorry, --enable-dbgutil won't work with MSVC])
     fi
 
     AC_MSG_RESULT([yes])
commit 42b722a83af8e38860a62d1541dca27ba41b5120
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 26 14:32:00 2011 +0200

    Fix berkeleydb mingw cross-build.

diff --git a/berkeleydb/makefile.mk b/berkeleydb/makefile.mk
index 93234f0..825795a 100644
--- a/berkeleydb/makefile.mk
+++ b/berkeleydb/makefile.mk
@@ -131,14 +131,13 @@ OUT2INC= \
 CONFIGURE_DIR=out
 #relative to CONFIGURE_DIR
 # TODO needs clean up
-CFLAGS+=-nostdinc
 db_CC=$(CC) -mthreads
 db_CXX=$(CXX) -mthreads
 .IF "$(MINGW_SHARED_GCCLIB)"=="YES"
 db_CC+=-shared-libgcc
 db_CXX+=-shared-libgcc
 .ENDIF
-db_LDFLAGS=-no-undefined -L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin
+db_LDFLAGS=-L$(SOLARVER)/$(INPATH)/lib -L$(SOLARVER)/$(INPATH)/bin
 db_LDFLAGS+=-L$(COMPATH)/lib -L$(MINGW_CLIB_DIR)
 db_LIBS=
 .IF "$(MINGW_SHARED_GXXLIB)"=="YES"
@@ -150,7 +149,7 @@ db_LIBXSO_LIBS=$(db_LIBS)
 db_LIBXSO_LIBS+=-lgcc_s
 .ENDIF
 CONFIGURE_ACTION=..$/dist$/configure
-CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --build=i586-pc-mingw32 --host=i586-pc-mingw32 --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)"
+CONFIGURE_FLAGS=--disable-cxx --enable-dynamic --enable-shared --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --enable-mingw CC="$(db_CC)" CXX="$(db_CXX)" LN_S=ln NM="$(WRAPCMD) nm" OBJDUMP="$(WRAPCMD) objdump" JAVA="$(WRAPCMD) -env java" JAVAC="$(WRAPCMD) -env javac" CFLAGS="$(CFLAGS)" CPPFLAGS="$(INCLUDE)" LDFLAGS="$(db_LDFLAGS)" LIBS="$(db_LIBS)" LIBSO_LIBS="$(db_LIBS)" LIBJSO_LIBS="$(db_LIBS)" LIBXSO_LIBS="$(db_LIBXSO_LIBS)"
 
 BUILD_DIR=$(CONFIGURE_DIR)
 BUILD_DIR_OUT=$(CONFIGURE_DIR)
commit 8df68b4e1f0abdff732f4a054b74db60fcf9d1af
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 26 14:26:17 2011 +0200

    missing dependency

diff --git a/i18nutil/prj/build.lst b/i18nutil/prj/build.lst
index 29a5aed..f856807 100644
--- a/i18nutil/prj/build.lst
+++ b/i18nutil/prj/build.lst
@@ -1,2 +1,2 @@
-inu  i18nutil    :   sal cppu comphelper offapi NULL
+inu  i18nutil    :   sal cppu comphelper offapi ICU:icu NULL
 inu  i18nutil\prj       nmake   -   all inu_prj NULL