From c69733db0ab3b4a954e87443796acd9cac435062 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 4 Feb 2014 07:49:08 +0000 Subject: 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 --- Build/source/libs/cairo/ChangeLog | 5 +++++ Build/source/libs/cairo/configure | 4 +++- Build/source/libs/cairo/configure.ac | 5 +++-- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'Build/source/libs/cairo') 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 + + * configure.ac: Use -Wno-attributes only for gcc Version 4.2 and + better (unsupported in 4.0.1). + 2013-10-31 Peter Breitenlohner * 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 +dnl Copyright (C) 2012-2014 Peter Breitenlohner 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]) -- cgit v1.2.3