[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - 4 commits - configure.ac RepositoryModule_host.mk

[Michael Stahl]

 RepositoryModule_host.mk |   33 +++++++++++----------------------
 configure.ac             |    2 ++
 2 files changed, 13 insertions(+), 22 deletions(-)

New commits:
commit d2c26bafc7675080c9cd65ac9844ae39497bd37f
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri May 31 15:24:34 2013 +0200

    configure: use -isystem for GSTREAMER_CFLAGS
    
    ... to work around GCC 4.8.0 -Werror=literal-suffix in gst/video/video.h
    definition of GST_VIDEO_CAPS_RGB8_PALETTED.
    
    Change-Id: I514b29d58f348bad0b13c7ef66db4b3ee34516cd
    (cherry picked from commit 18b0bda1be62da1b0f9c1fc40864ccc486d5b43c)

diff --git a/configure.ac b/configure.ac
index 1818f2c..c31a287 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9513,6 +9513,7 @@ if test "$build_gstreamer" = "yes"; then
         ENABLE_GSTREAMER="TRUE"
         AC_MSG_RESULT([yes])
         PKG_CHECK_MODULES( GSTREAMER, gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-video-1.0 )
+        GSTREAMER_CFLAGS="`echo $GSTREAMER_CFLAGS | sed -e \"s/-I/${ISYSTEM}/g\"`"
     else
         AC_MSG_RESULT([no])
     fi
@@ -9532,6 +9533,7 @@ if test "$build_gstreamer_0_10" = "yes"; then
         PKG_CHECK_MODULES( [GSTREAMER_0_10], [gstreamer-0.10 gstreamer-plugins-base-0.10 gstreamer-interfaces-0.10],, [
             PKG_CHECK_MODULES(  [GSTREAMER_0_10], [gstreamer-0.10 gstreamer-plugins-base-0.10] )
         ])
+        GSTREAMER_0_10_CFLAGS="`echo $GSTREAMER_0_10_CFLAGS | sed -e \"s/-I/${ISYSTEM}/g\"`"
     else
         AC_MSG_RESULT([no])
     fi
commit 9853280211974d20b519624c16b2e7e6f76e7400
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri May 31 23:09:20 2013 +0200

    RepositoryModule: add the libraries back from the reverted commit
    
    ... but this time hopefully topologically sorted.
    
    Change-Id: I94960795d729d803641fe7bbf47797f733b56c40
    (cherry picked from commit c70e55c5d8ecfd5bb690886d7e39a42f66b3702a)

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 259ca29..b9e64f2 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -241,6 +241,8 @@ $(if $(strip $(1)),\
 $(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1))))
 endef
 
+# DO NOT SORT ALPHABETICALLY: the libraries must be listed in dependency order,
+# otherwise cyclic dependencies ruin everything.
 # do not serialize on a partial build as that may fail due to missing deps.
 # the default goal is all (see Module.mk)
 ifeq (,$(filter-out all,$(MAKECMDGOALS)))
@@ -249,9 +251,9 @@ $(eval $(call repositorymodule_serialize,\
 	$(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \
 	sc msword swui sw sd \
 	$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \
-	writerfilter cui chartcontroller oox \
+	writerfilter cui chartcontroller chartcore oox svx \
 	$(if $(MERGELIBS),merged,svxcore) \
-	xo vcl \
+	xo sfx fwk svt vcl \
 ))
 endif
 
commit ab9b5f4095d3846cb0d66707bed8d2d36e586902
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri May 31 23:02:33 2013 +0200

    RepositoryModule: un-break serialization of libraries
    
    The serialization was effectively disabled because the top-level
    Makefile does not invoke Makefile.gbuild with "all" target but with
    empty (default) target so MAKECMDS is empty.
    
    (regression from 96409470b19d32a2310086b089542b333686f4da)
    
    Change-Id: I919c6543a282945cbb36468ff0d4666718a7d8f6
    (cherry picked from commit c4f7ed869fec153b92bee00b191b5504efdd09d7)

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 93a2fe7..259ca29 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -241,7 +241,9 @@ $(if $(strip $(1)),\
 $(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1))))
 endef
 
-ifeq (all,$(filter all,$(MAKECMDGOALS)))
+# do not serialize on a partial build as that may fail due to missing deps.
+# the default goal is all (see Module.mk)
+ifeq (,$(filter-out all,$(MAKECMDGOALS)))
 $(eval $(call repositorymodule_serialize,\
 	scfilt \
 	$(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \
commit c54dcf2ef21ad8ecdd13282ac2c69f2a772524f4
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri May 31 22:51:40 2013 +0200

    Revert "update the list of serialized libs"
    
    This reverts commit fd3a23ce33bdec454273ba2bb3ea307b8420bcc0.
    
    The list of serialized libraries must be sorted in dependency order,
    otherwise there will be cyclic dependencies.
    (cherry picked from commit fcca05c337bb0e4ffc2df88b4da4559f42598295)

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 6f16d13..93a2fe7 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -241,30 +241,15 @@ $(if $(strip $(1)),\
 $(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1))))
 endef
 
-# this list consists of libraries above the arbitrary cut-off of 30M
-# on a --enable-debug linux build
 ifeq (all,$(filter all,$(MAKECMDGOALS)))
 $(eval $(call repositorymodule_serialize,\
-	chartcore \
-	chartcontroller \
-	cui \
-	$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
-	fwk \
-	$(if $(MERGELIBS),merged) \
-	msword \
-	oox \
-	sc \
 	scfilt \
-	sd \
-	sfx \
-	svt \
-	svx \
-	svxcore \
-	sw \
-	swui \
-	vcl \
-	writerfilter \
-	xo \
+	$(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \
+	sc msword swui sw sd \
+	$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \
+	writerfilter cui chartcontroller oox \
+	$(if $(MERGELIBS),merged,svxcore) \
+	xo vcl \
 ))
 endif