Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (b17fc5b5c875de27bf46e7d8370855fd65d763bf)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (b17fc5b5c875de27bf46e7d8370855fd65d763bf)
  • Date: Sun, 24 Aug 2014 09:10:53 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

x11-libs/cairo/HISTORY | 3 +++
x11-libs/cairo/PRE_BUILD | 4 +++-
x11-libs/cairo/cairo-broken-lto-build.patch | 26 ++++++++++++++++++++++++++
3 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit b17fc5b5c875de27bf46e7d8370855fd65d763bf
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

cairo: build fix

diff --git a/x11-libs/cairo/HISTORY b/x11-libs/cairo/HISTORY
index 1f5cbf9..895ceb6 100644
--- a/x11-libs/cairo/HISTORY
+++ b/x11-libs/cairo/HISTORY
@@ -1,3 +1,6 @@
+2014-08-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, cairo-broken-lto-build.patch: a build fix, bad relocation
+
2014-07-04 Pol Vinogradov <vin.public AT 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 e94bf95..d77360e 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 0000000..8cb0f50
--- /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



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (b17fc5b5c875de27bf46e7d8370855fd65d763bf), Thomas Orgis, 08/24/2014

Archive powered by MHonArc 2.6.24.

Top of Page