[Libreoffice-commits] core.git: 2 commits - libcdr/ExternalProject_libcdr.mk liblangtag/ExternalProject_langtag.mk libmspub/ExternalProject_libmspub.mk libmwaw/ExternalProject_libmwaw.mk libodfgen/ExternalProject_libodfgen.mk liborcus/ExternalProject_liborcus.mk libvisio/ExternalProject_libvisio.mk libwpd/ExternalProject_libwpd.mk libwpg/ExternalProject_libwpg.mk libwps/ExternalProject_libwps.mk sw/source
Tor Lillqvist
tml at collabora.com
Thu Oct 10 13:06:35 PDT 2013
libcdr/ExternalProject_libcdr.mk | 4 +++-
liblangtag/ExternalProject_langtag.mk | 4 +++-
libmspub/ExternalProject_libmspub.mk | 4 +++-
libmwaw/ExternalProject_libmwaw.mk | 4 +++-
libodfgen/ExternalProject_libodfgen.mk | 4 +++-
liborcus/ExternalProject_liborcus.mk | 3 ++-
libvisio/ExternalProject_libvisio.mk | 4 +++-
libwpd/ExternalProject_libwpd.mk | 3 ++-
libwpg/ExternalProject_libwpg.mk | 4 +++-
libwps/ExternalProject_libwps.mk | 4 +++-
sw/source/core/layout/newfrm.cxx | 2 +-
11 files changed, 29 insertions(+), 11 deletions(-)
New commits:
commit 4192ac4a3af3a6ec5152b5fc967537945e749122
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Oct 10 17:48:53 2013 +0300
Fix typo in silly OSL_ENSURE warning text
Sure, it would make more sense to print out some information that would
actually help in finding out what's wrong...
Change-Id: I52f7921ad66214cadc58e39487b2447766bfd102
diff --git a/sw/source/core/layout/newfrm.cxx b/sw/source/core/layout/newfrm.cxx
index 865193e..c246dbb 100644
--- a/sw/source/core/layout/newfrm.cxx
+++ b/sw/source/core/layout/newfrm.cxx
@@ -373,7 +373,7 @@ void _FrmFinit()
if( (*SwFrm::GetCachePtr())[ --n ] )
{
SwCacheObj* pObj = (*SwFrm::GetCachePtr())[ n ];
- OSL_ENSURE( !pObj, "Who didn't derregister?");
+ OSL_ENSURE( !pObj, "Who didn't deregister?");
}
#endif
delete SwRootFrm::pVout;
commit 1ca84e796751997a6b18893ae2cb969673bc0317
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Oct 10 13:43:06 2013 +0300
Propagate verbosity to (some) 3rd-party library builds
In a verbose (if verbose or VERBOSE are non-empty) build, pass V=1 to some of
the Automake-based external projects, to get verbose output from their builds.
This is just a start, should check for all bundled libraries whether there is
a simple way to make their build verbose.
Change-Id: I470b3be7f43aaa09d5f7102da891f538799a3631
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index 1a22490..9dda27f 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -37,7 +37,9 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) :
--disable-weffc \
CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
+ && (cd $(EXTERNAL_WORKDIR)/src/lib && \
+ $(if $(VERBOSE)$(verbose),V=1) \
+ $(MAKE)) \
)
# vim: set noet sw=4 ts=4:
diff --git a/liblangtag/ExternalProject_langtag.mk b/liblangtag/ExternalProject_langtag.mk
index 945bb68..23619ed 100644
--- a/liblangtag/ExternalProject_langtag.mk
+++ b/liblangtag/ExternalProject_langtag.mk
@@ -33,6 +33,8 @@ $(call gb_ExternalProject_get_state_target,langtag,build):
$(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
$(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \
$(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \
- && $(if $(filter WNTMSC,$(OS)$(COM)),REAL_CC="$(shell cygpath -w $(lastword $(CC)))") $(MAKE) \
+ && $(if $(filter WNTMSC,$(OS)$(COM)),REAL_CC="$(shell cygpath -w $(lastword $(CC)))") \
+ $(if $(VERBOSE)$(verbose),V=1) \
+ $(MAKE) \
)
# vim: set noet sw=4 ts=4:
diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk
index 5fb3133..9da4dc5 100644
--- a/libmspub/ExternalProject_libmspub.mk
+++ b/libmspub/ExternalProject_libmspub.mk
@@ -35,7 +35,9 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) :
--disable-weffc \
$(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(call gb_UnpackedTarball_get_dir,boost),CXXFLAGS=$(BOOST_CPPFLAGS)) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
+ && (cd $(EXTERNAL_WORKDIR)/src/lib && \
+ $(if $(VERBOSE)$(verbose),V=1) \
+ $(MAKE)) \
)
# vim: set noet sw=4 ts=4:
diff --git a/libmwaw/ExternalProject_libmwaw.mk b/libmwaw/ExternalProject_libmwaw.mk
index 82b4a3d..a500192 100644
--- a/libmwaw/ExternalProject_libmwaw.mk
+++ b/libmwaw/ExternalProject_libmwaw.mk
@@ -32,7 +32,9 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
--disable-werror \
CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
+ && (cd $(EXTERNAL_WORKDIR)/src/lib && \
+ $(if $(VERBOSE)$(verbose),V=1) \
+ $(MAKE)) \
)
# vim: set noet sw=4 ts=4:
diff --git a/libodfgen/ExternalProject_libodfgen.mk b/libodfgen/ExternalProject_libodfgen.mk
index 3b0ce21..8514282 100644
--- a/libodfgen/ExternalProject_libodfgen.mk
+++ b/libodfgen/ExternalProject_libodfgen.mk
@@ -33,7 +33,9 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
--disable-weffc \
CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- && (cd $(EXTERNAL_WORKDIR)/src && $(MAKE)) \
+ && (cd $(EXTERNAL_WORKDIR)/src && \
+ $(if $(VERBOSE)$(verbose),V=1) \
+ $(MAKE)) \
)
# vim: set noet sw=4 ts=4:
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index 5790131..6497420 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -93,7 +93,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
--disable-werror \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
$(if $(filter NO,$(SYSTEM_BOOST)),--with-boost-system=boostsystem) \
- && $(MAKE) \
+ && $(if $(VERBOSE)$(verbose),V=1) \
+ $(MAKE) \
)
# vim: set noet sw=4 ts=4:
diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk
index f5116e3..ea5286b 100644
--- a/libvisio/ExternalProject_libvisio.mk
+++ b/libvisio/ExternalProject_libvisio.mk
@@ -37,7 +37,9 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS)) \
$(if $(filter NO,$(SYSTEM_LIBXML)),-I$(call gb_UnpackedTarball_get_dir,xml2)/include)" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
+ && (cd $(EXTERNAL_WORKDIR)/src/lib && \
+ $(if $(VERBOSE)$(verbose),V=1) \
+ $(MAKE)) \
)
# vim: set noet sw=4 ts=4:
diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk
index 8fb4a8c..86cf806 100644
--- a/libwpd/ExternalProject_libwpd.mk
+++ b/libwpd/ExternalProject_libwpd.mk
@@ -27,7 +27,8 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) :
--disable-debug \
$(if $(filter MACOSX,$(OS)),--disable-werror) \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- && $(MAKE) \
+ && $(if $(VERBOSE)$(verbose),V=1) \
+ $(MAKE) \
)
# vim: set noet sw=4 ts=4:
diff --git a/libwpg/ExternalProject_libwpg.mk b/libwpg/ExternalProject_libwpg.mk
index 226474c..ee8bad3 100644
--- a/libwpg/ExternalProject_libwpg.mk
+++ b/libwpg/ExternalProject_libwpg.mk
@@ -30,7 +30,9 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) :
--disable-debug \
--disable-werror \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
+ && (cd $(EXTERNAL_WORKDIR)/src/lib && \
+ $(if $(VERBOSE)$(verbose),V=1) \
+ $(MAKE)) \
)
# vim: set noet sw=4 ts=4:
diff --git a/libwps/ExternalProject_libwps.mk b/libwps/ExternalProject_libwps.mk
index ba1bdb0..5af9ded 100644
--- a/libwps/ExternalProject_libwps.mk
+++ b/libwps/ExternalProject_libwps.mk
@@ -32,7 +32,9 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
--disable-werror \
CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
- && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
+ && (cd $(EXTERNAL_WORKDIR)/src/lib && \
+ $(if $(VERBOSE)$(verbose),V=1) \
+ $(MAKE)) \
)
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list