[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 2 commits - cairo/cairo cairo/UnpackedTarball_cairo.mk configure.ac

[Michael Stahl]

 cairo/UnpackedTarball_cairo.mk  |    6 ++++++
 cairo/cairo/no-flto-clang.patch |   11 +++++++++++
 configure.ac                    |    2 ++
 3 files changed, 19 insertions(+)

New commits:
commit 833db52c5cb38c0ae61f80db98191eea08e2f6f3
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)
    
    Signed-off-by: Luboš Luňák <l.lunak at suse.cz>

diff --git a/configure.ac b/configure.ac
index 92f0cfa..e4c6827 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9614,6 +9614,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
@@ -9633,6 +9634,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 a0f87de207c27785e1c9a4b4f11bbe8b704990b9
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Wed Jun 26 15:13:54 2013 +0200

    prevent cairo from using -flto with clang, cairo uses it incorrectly
    
    The option should be used also at link time (as e.g. the gcc man page says),
    but cairo doesn't do so, and since -flto makes clang generate .o with LLVM
    bytecode, plain ld chokes on it.
    
    Change-Id: Ia5ce9a98afa4f88b8d0943a5971450d7009af913
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/cairo/UnpackedTarball_cairo.mk b/cairo/UnpackedTarball_cairo.mk
index fd14ffe..93cd015 100644
--- a/cairo/UnpackedTarball_cairo.mk
+++ b/cairo/UnpackedTarball_cairo.mk
@@ -41,4 +41,10 @@ ifneq (,$(filter ANDROID IOS,$(OS)))
 $(eval $(call gb_UnpackedTarball_add_file,cairo,.,cairo/cairo/dummy_pkg_config))
 endif
 
+ifeq ($(COM_GCC_IS_CLANG),TRUE)
+$(eval $(call gb_UnpackedTarball_add_patches,cairo,\
+	cairo/cairo/no-flto-clang.patch \
+))
+endif
+
 # vim: set noet sw=4 ts=4:
diff --git a/cairo/cairo/no-flto-clang.patch b/cairo/cairo/no-flto-clang.patch
new file mode 100644
index 0000000..725f484
--- /dev/null
+++ b/cairo/cairo/no-flto-clang.patch
@@ -0,0 +1,11 @@
+--- misc/cairo-1.10.2/configure.sav	2013-06-26 15:00:42.000000000 +0200
++++ misc/cairo-1.10.2/configure	2013-06-26 15:03:36.995117032 +0200
+@@ -17236,7 +17236,7 @@ MAYBE_WARN="-Wall -Wextra \
+ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \
+ 			-erroff=E_ENUM_TYPE_MISMATCH_OP"
+ 
+-MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto"
++MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
+ 
+ MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2"
+