diff options
| author |   Jim Ramsay <lack@gentoo.org> | 2010-08-11 14:52:35 +0000 |
|---|---|---|
| committer | Jim Ramsay <lack@gentoo.org> | 2010-08-11 14:52:35 +0000 |
| commit | 419a487ddc20965b3580f2febab395303eeab9b9 (patch) | |
| tree | 3a6f156f089321ed3d499ae5faf3557ed43156aa /rox-base/rox-media/files | |
| parent | x86 stable wrt security bug #332193 (diff) | |
| download | gentoo-2-419a487ddc20965b3580f2febab395303eeab9b9.tar.gz gentoo-2-419a487ddc20965b3580f2febab395303eeab9b9.tar.bz2 gentoo-2-419a487ddc20965b3580f2febab395303eeab9b9.zip | |
Respect LDFLAGS, CFLAGS, and CC (Bug #332227)
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'rox-base/rox-media/files')
| -rw-r--r-- | rox-base/rox-media/files/rox-media-0.0.3-Respect-env.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/rox-base/rox-media/files/rox-media-0.0.3-Respect-env.patch b/rox-base/rox-media/files/rox-media-0.0.3-Respect-env.patch new file mode 100644 index 000000000000..291ad1a0d13f --- /dev/null +++ b/rox-base/rox-media/files/rox-media-0.0.3-Respect-env.patch @@ -0,0 +1,24 @@ +diff --git a/src/SConscript b/src/SConscript +index 6447851..85094b2 100644 +--- a/src/SConscript ++++ b/src/SConscript +@@ -1,4 +1,5 @@ + import os, sys ++import SCons.Util + + media_env = Environment() + conf = Configure(media_env) +@@ -19,6 +20,13 @@ for l in appinfo: + vstring = l.replace('<Version>', '').replace('</Version>', '') + break + ++if os.environ.has_key('CC'): ++ media_env['CC'] = os.environ['CC'] ++if os.environ.has_key('CFLAGS'): ++ media_env.Append(CFLAGS = SCons.Util.CLVar(os.environ['CFLAGS'])) ++if os.environ.has_key('LDFLAGS'): ++ media_env.Append(LINKFLAGS = SCons.Util.CLVar(os.environ['LDFLAGS'])) ++ + media_env.ParseConfig('pkg-config --cflags --libs ' \ + 'gconf-2.0 gdu gtk+-2.0 gdk-pixbuf-2.0') + media_env.Append(CFLAGS = ['-DGDU_API_IS_SUBJECT_TO_CHANGE', |