rpm/cairo
SHA256
1
0
Fork 0
forked from pool/cairo
Code Pull Requests Activity

Accepting request 197001 from home:namtrac:bugfix

Browse Source 
- Add cairo-disable-lto.patch to disable LTO on s390{x} to fix the
  build.

OBS-URL: https://build.opensuse.org/request/show/197001
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=78
This commit is contained in:
Bjørn Lie 2013-09-01 09:35:23 +00:00 committed by Git OBS Bridge
parent 83422e0200
commit 0065eee66c
3 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cairo-disable-lto.patch Normal file
View File

@ -0,0 +1,21 @@
Index: cairo-1.12.16/build/configure.ac.warnings
===================================================================
--- cairo-1.12.16.orig/build/configure.ac.warnings
+++ cairo-1.12.16/build/configure.ac.warnings
@@ -36,16 +36,6 @@ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_T
dnl We also abuse the warning-flag facility to enable other compiler
dnl options. Namely, the following:
-dnl -flto working really needs a test link, not just a compile
-
-safe_MAYBE_WARN="$MAYBE_WARN"
-MAYBE_WARN="$MAYBE_WARN -flto"
-AC_TRY_LINK([],[
- int main(int argc, char **argv) { return 0; }
-],[],[
- MAYBE_WARN="$safe_MAYBE_WARN"
-])
-
MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common"
dnl Also to turn various gcc/glibc-specific preprocessor checks

6
cairo.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Aug 28 20:42:58 UTC 2013 - idonmez@suse.com
- Add cairo-disable-lto.patch to disable LTO on s390{x} to fix the
build.
-------------------------------------------------------------------
Tue Aug 27 06:41:01 UTC 2013 - dimstar@opensuse.org

7
cairo.spec
View File

@ -30,6 +30,8 @@ Source: http://cairographics.org/releases/%{name}-%{version}.tar.xz
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM cairo-modules-no-version.patch fdo#29319 dimstar@opensuse.org -- Build modules with -module -avoid-version.
Patch0: cairo-modules-no-version.patch
# PATCH-FIX-OPENSUSE cairo-disable-lto.patch idoenmez@suse.de -- Disable -flto on s390{x}
Patch1: cairo-disable-lto.patch
# These libraries are needed only for tests.
# Do not enable tests in build systems, it causes build loop!
#BuildRequires: librsvg-devel poppler-devel
@ -148,9 +150,12 @@ cairo.
%prep
%setup -q
%patch0 -p1
%ifarch s390 s390x
%patch1 -p1
%endif
%build
# Needed by patch0
# Needed by patch0 and patch1
NOCONFIGURE=1 ./autogen.sh
%configure \
--with-pic \