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

Accepting request 80036 from home:coolo:branches:openSUSE:Factory

Browse Source 
- disable lto for cairo-sphinx as it breaks with as-needed

OBS-URL: https://build.opensuse.org/request/show/80036
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/cairo?expand=0&rev=43
This commit is contained in:
Vincent Untz 2011-09-02 16:01:14 +00:00 committed by Git OBS Bridge
parent 80a8e3fb73
commit 824e4f7d15
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cairo-fix-libs.patch Normal file
View File

@ -0,0 +1,13 @@
Index: cairo-1.10.2/util/cairo-sphinx/Makefile.am
===================================================================
--- cairo-1.10.2.orig/util/cairo-sphinx/Makefile.am 2011-08-29 13:44:11.000000000 +0200
+++ cairo-1.10.2/util/cairo-sphinx/Makefile.am 2011-08-29 14:03:37.386026554 +0200
@@ -16,7 +16,7 @@ cairo_sphinx_la_LIBADD = -ldl
cairo_sphinx_SOURCES = sphinx.c
cairo_sphinx_CPPFLAGS = $(AM_CPPFLAGS) -DLIBDIR="\"$(cairolibdir)\""
-cairo_sphinx_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS) $(glib_CFLAGS)
+cairo_sphinx_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS) $(glib_CFLAGS) -fno-lto
cairo_sphinx_LDADD = \
$(real_pthread_LIBS) \
$(top_builddir)/util/cairo-script/libcairo-script-interpreter.la \

5
cairo.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 29 12:06:00 UTC 2011 - coolo@novell.com
- disable lto for cairo-sphinx as it breaks with as-needed
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 22 15:19:31 CET 2011 - vuntz@opensuse.org Tue Feb 22 15:19:31 CET 2011 - vuntz@opensuse.org

4
cairo.spec
View File

@ -30,6 +30,8 @@ Source: %{name}-%{version}.tar.bz2
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-UPSTREAM cairo-modules-no-version.patch dimstar@opensuse.org -- Build modules with -module -avoid-version. # PATCH-FIX-UPSTREAM cairo-modules-no-version.patch dimstar@opensuse.org -- Build modules with -module -avoid-version.
Patch0: cairo-modules-no-version.patch Patch0: cairo-modules-no-version.patch
# PATCH-FIX-OPENSUSE cairo-fix-libs.patch coolo@suse.de -- Fix build with newer ld
Patch1: cairo-fix-libs.patch
# These libraries are needed only for tests. # These libraries are needed only for tests.
# Do not enable tests in build systems, it causes build loop! # Do not enable tests in build systems, it causes build loop!
#BuildRequires: librsvg-devel poppler-devel #BuildRequires: librsvg-devel poppler-devel
@ -144,10 +146,12 @@ cairo.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
%configure \ %configure \
--disable-silent-rules \
--with-pic \ --with-pic \
--enable-fc \ --enable-fc \
--enable-ft \ --enable-ft \