[gtk-osx: 2/6] Preserve previous $CFLAGS for liboil

[John Ralls <jralls src gnome org>]

commit 4417f3679b1a68afcc6bff5150998bf8415b0ec8
Author: Philip Chimento <philip chimento gmail com>
Date:   Tue Jan 15 10:30:30 2013 +0100

    Preserve previous $CFLAGS for liboil
    
    If the existing CFLAGS are clobbered and replaced with
    -DHAVE_SYMBOL_UNDERSCORE, then a 64-bit compiler will be used on
    a 64-bit system even if a 32-bit compiler has been specified. This
    causes the build to fail when it tries to compile 32-bit assembly
    language.

 modulesets-stable/gtk-osx-gstreamer.modules   |    2 +-
 modulesets-unstable/gtk-osx-gstreamer.modules |    2 +-
 modulesets/gtk-osx-gstreamer.modules          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-gstreamer.modules b/modulesets-stable/gtk-osx-gstreamer.modules
index 34ea6a8..b088dcc 100644
--- a/modulesets-stable/gtk-osx-gstreamer.modules
+++ b/modulesets-stable/gtk-osx-gstreamer.modules
@@ -12,7 +12,7 @@
 	      href="http://code.entropywave.com/download/"/>
 
   <autotools id="liboil" autogen-template="autoreconf -fis &amp;&amp; %(srcdir)s/configure --prefix %(prefix)s --libdir %(libdir)s %(autogenargs)s"
-	     makeargs=" CFLAGS=-DHAVE_SYMBOL_UNDERSCORE">
+	     makeargs=' CFLAGS="$CFLAGS -DHAVE_SYMBOL_UNDERSCORE"'>
     <branch repo="liboil" module="liboil-0.3.17.tar.gz" version="0.3.17" />
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx-gstreamer.modules b/modulesets-unstable/gtk-osx-gstreamer.modules
index 823b059..bf82e12 100644
--- a/modulesets-unstable/gtk-osx-gstreamer.modules
+++ b/modulesets-unstable/gtk-osx-gstreamer.modules
@@ -16,7 +16,7 @@
        git://anongit.freedesktop.org/gstreamer/jhbuild/. The modules
        are unversioned and haven't been tested for gtk-osx
        compatibility, but there are more of them. -->
-  <autotools id="liboil" makeargs=" CFLAGS=-DHAVE_SYMBOL_UNDERSCORE">
+  <autotools id="liboil" makeargs=' CFLAGS="$CFLAGS -DHAVE_SYMBOL_UNDERSCORE"'>
     <branch repo="liboil"  />
   </autotools>
 
diff --git a/modulesets/gtk-osx-gstreamer.modules b/modulesets/gtk-osx-gstreamer.modules
index 063808a..b188584 100644
--- a/modulesets/gtk-osx-gstreamer.modules
+++ b/modulesets/gtk-osx-gstreamer.modules
@@ -16,7 +16,7 @@
        git://anongit.freedesktop.org/gstreamer/jhbuild/. The modules
        are unversioned and haven't been tested for gtk-osx
        compatibility. -->
-  <autotools id="liboil" makeargs=" CFLAGS=-DHAVE_SYMBOL_UNDERSCORE">
+  <autotools id="liboil" makeargs=' CFLAGS="$CFLAGS -DHAVE_SYMBOL_UNDERSCORE"'>
     <branch repo="liboil" tag="liboil-0.3.17" />
   </autotools>