diff options
| author | Thomas Orgis | 2014-08-24 16:10:56 +0200 |
|---|---|---|
| committer | Thomas Orgis | 2014-08-24 16:10:56 +0200 |
| commit | b17fc5b5c875de27bf46e7d8370855fd65d763bf (patch) | |
| tree | ec9b836c2f3e4bba33d6a2f136f085e30117cd07 /x11-libs/cairo | |
| parent | a6753b84f253d909e6a7dc4df1cd43729fa54280 (diff) | |
cairo: build fix
Diffstat (limited to 'x11-libs/cairo')
| -rw-r--r-- | x11-libs/cairo/HISTORY | 3 | ||||
| -rwxr-xr-x | x11-libs/cairo/PRE_BUILD | 4 | ||||
| -rw-r--r-- | x11-libs/cairo/cairo-broken-lto-build.patch | 26 |
3 files changed, 32 insertions, 1 deletions
diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY index 1f5cbf97d6..895ceb61da 100644 --- a/x11-libs/cairo/HISTORY +++ b/x11-libs/cairo/HISTORY @@ -1,3 +1,6 @@ +2014-08-24 Thomas Orgis <sobukus@sourcemage.org> + * PRE_BUILD, cairo-broken-lto-build.patch: a build fix, bad relocation + 2014-07-04 Pol Vinogradov <vin.public@gmail.com> * DETAILS, PRE_BUILD, PREPARE, PRE_BUILD, PRE_SUB_DEPENDS, REPAIR^all^PRE_SUB_DEPENDS, SUB_DEPENDS: added scm branch diff --git a/x11-libs/cairo/PRE_BUILD b/x11-libs/cairo/PRE_BUILD index e94bf95c23..d77360e4f4 100755 --- a/x11-libs/cairo/PRE_BUILD +++ b/x11-libs/cairo/PRE_BUILD @@ -5,5 +5,7 @@ if [[ "$CAIRO_BRANCH" == "scm" ]]; then NOCONFIGURE=1 ./autogen.sh else # http://bugs.gentoo.org/show_bug.cgi?id=336696 - patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch + patch -p1 -d "$SOURCE_DIRECTORY" < "$SPELL_DIRECTORY/cairo-1.10.0-buggy_gradients.patch" && + # http://sourceforge.net/p/mingw-w64/bugs/396/ + patch -p1 < "$SPELL_DIRECTORY/cairo-broken-lto-build.patch" fi diff --git a/x11-libs/cairo/cairo-broken-lto-build.patch b/x11-libs/cairo/cairo-broken-lto-build.patch new file mode 100644 index 0000000000..8cb0f50b85 --- /dev/null +++ b/x11-libs/cairo/cairo-broken-lto-build.patch @@ -0,0 +1,26 @@ +diff -ru cairo-1.12.16.orig/build/configure.ac.warnings cairo-1.12.16/build/configure.ac.warnings +--- cairo-1.12.16.orig/build/configure.ac.warnings 2013-08-26 17:07:21.000000000 +0200 ++++ cairo-1.12.16/build/configure.ac.warnings 2014-08-08 08:13:14.566163013 +0200 +@@ -39,7 +39,7 @@ + dnl -flto working really needs a test link, not just a compile + + safe_MAYBE_WARN="$MAYBE_WARN" +-MAYBE_WARN="$MAYBE_WARN -flto" ++MAYBE_WARN="$MAYBE_WARN -flto -ffat-lto-objects -fuse-linker-plugin" + AC_TRY_LINK([],[ + int main(int argc, char **argv) { return 0; } + ],[],[ +Only in cairo-1.12.16/build: configure.ac.warnings.orig +diff -ru cairo-1.12.16.orig/configure cairo-1.12.16/configure +--- cairo-1.12.16.orig/configure 2013-08-26 19:00:41.000000000 +0200 ++++ cairo-1.12.16/configure 2014-08-08 08:15:19.576158790 +0200 +@@ -18147,7 +18147,7 @@ + + + safe_MAYBE_WARN="$MAYBE_WARN" +-MAYBE_WARN="$MAYBE_WARN -flto" ++MAYBE_WARN="$MAYBE_WARN -flto -ffat-lto-objects -fuse-linker-plugin" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +Only in cairo-1.12.16: configure.orig |