diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-02-04 07:49:08 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2014-02-04 07:49:08 +0000 |
| commit | c69733db0ab3b4a954e87443796acd9cac435062 (patch) | |
| tree | 8c77212377e9e15326590b552cbc015b98b79ed5 /Build/source/libs/cairo | |
| parent | 2bc219951a857706b1b0f9806d1f14728766fcba (diff) | |
Use -Wno-attributes only for gcc Version 4.2 and better (unsupported in 4.0.1)
git-svn-id: svn://tug.org/texlive/trunk@32870 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/cairo')
| -rw-r--r-- | Build/source/libs/cairo/ChangeLog | 5 | ||||
| -rwxr-xr-x | Build/source/libs/cairo/configure | 4 | ||||
| -rw-r--r-- | Build/source/libs/cairo/configure.ac | 5 |
3 files changed, 11 insertions, 3 deletions
diff --git a/Build/source/libs/cairo/ChangeLog b/Build/source/libs/cairo/ChangeLog index bb16dcdb629..77cb09cf2db 100644 --- a/Build/source/libs/cairo/ChangeLog +++ b/Build/source/libs/cairo/ChangeLog @@ -1,3 +1,8 @@ +2014-02-04 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac: Use -Wno-attributes only for gcc Version 4.2 and + better (unsupported in 4.0.1). + 2013-10-31 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am, configure.ac, cairo/Makefile.am: Prepare for SVG. diff --git a/Build/source/libs/cairo/configure b/Build/source/libs/cairo/configure index fd63bc8ceca..f8dbfe1be92 100755 --- a/Build/source/libs/cairo/configure +++ b/Build/source/libs/cairo/configure @@ -5712,7 +5712,9 @@ esac cairo_attribute_flag= if test "x$GCC" = xyes; then case `$CC -dumpversion` in #( - 4.*) : + 4.[01].* ) : + ;; #( + 4.* | 5.*) : cairo_attribute_flag=-Wno-attributes ;; #( *) : ;; diff --git a/Build/source/libs/cairo/configure.ac b/Build/source/libs/cairo/configure.ac index 96c2c418fd7..27fe9c7c35e 100644 --- a/Build/source/libs/cairo/configure.ac +++ b/Build/source/libs/cairo/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2012-2014 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -25,7 +25,8 @@ CAIRO_BIGENDIAN cairo_attribute_flag= if test "x$GCC" = xyes; then AS_CASE([`$CC -dumpversion`], - [4.*], [cairo_attribute_flag=-Wno-attributes]) + [4.@<:@01@:>@.* ], [], + [4.* | 5.*], [cairo_attribute_flag=-Wno-attributes]) fi AC_SUBST([CAIRO_ATTRIBUTE_FLAG], [$cairo_attribute_flag]) |