diff options
Diffstat (limited to 'extra/cairo')
| -rw-r--r-- | extra/cairo/PKGBUILD | 19 | ||||
| -rw-r--r-- | extra/cairo/cairo-1.12.16-lto-optional.patch | 29 |
2 files changed, 44 insertions, 4 deletions
diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD index 63717626d..9e89c6576 100644 --- a/extra/cairo/PKGBUILD +++ b/extra/cairo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 197880 2013-10-30 11:26:13Z allan $ +# $Id: PKGBUILD 213824 2014-05-29 16:21:41Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Brice Carpentier <brice@daknet.org> pkgname=cairo pkgver=1.12.16 -pkgrel=1 +pkgrel=2 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64) license=('LGPL' 'MPL') @@ -16,8 +16,18 @@ makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' #optdepends=('xcb-util: for XCB backend') # really needed? provides=('cairo-xcb') replaces=('cairo-xcb') -source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz) -sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec') +source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz + cairo-1.12.16-lto-optional.patch) +sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec' + '80883e44a57942762995aea2f136701b1fa54568') + +prepare() { + cd $pkgname-$pkgver + # https://bugs.archlinux.org/task/40313 + https://bugs.gentoo.org/510782 + # patch to make it optional is taken from Gentoo + patch -Np1 -i $srcdir/cairo-1.12.16-lto-optional.patch + autoreconf -vfi +} build() { cd $pkgname-$pkgver @@ -26,6 +36,7 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --disable-static \ + --disable-lto \ --enable-tee \ --enable-gl \ --enable-egl \ diff --git a/extra/cairo/cairo-1.12.16-lto-optional.patch b/extra/cairo/cairo-1.12.16-lto-optional.patch new file mode 100644 index 000000000..8e3c6186c --- /dev/null +++ b/extra/cairo/cairo-1.12.16-lto-optional.patch @@ -0,0 +1,29 @@ +diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings +index f984eb2..15b3da2 100644 +--- a/build/configure.ac.warnings ++++ b/build/configure.ac.warnings +@@ -38,13 +38,18 @@ 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([],[ ++AC_ARG_ENABLE(lto, ++ AS_HELP_STRING([--disable-lto], ++ [Do not try to use Link-Time Optimization])) ++if test "x$enable_lto" != "xno"; then ++ 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" +-]) ++ ]) ++fi + + MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" + + |