diff options
| author |   Christian Faulhammer <opfer@gentoo.org> | 2006-11-24 13:03:38 +0000 |
|---|---|---|
| committer | Christian Faulhammer <opfer@gentoo.org> | 2006-11-24 13:03:38 +0000 |
| commit | 69bbf0baee53ccd7c008f12f25f2548a1ecfd751 (patch) | |
| tree | 6975ab7fb227efd72be054052a9288636c28e63b /x11-misc/gaia | |
| parent | Fix setXid patch, thanks to yngwin on freenode for reporting. (diff) | |
| download | gentoo-2-69bbf0baee53ccd7c008f12f25f2548a1ecfd751.tar.gz gentoo-2-69bbf0baee53ccd7c008f12f25f2548a1ecfd751.tar.bz2 gentoo-2-69bbf0baee53ccd7c008f12f25f2548a1ecfd751.zip | |
reworked patch with help of Marien Zwart <marienz@gentoo.org>
(Portage version: 2.1.1-r2)
Diffstat (limited to 'x11-misc/gaia')
| -rw-r--r-- | x11-misc/gaia/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/gaia/files/gaia-respect_CFLAGS.patch | 17 |
2 files changed, 10 insertions, 13 deletions
diff --git a/x11-misc/gaia/ChangeLog b/x11-misc/gaia/ChangeLog index 594b1c1c9c75..a712f7979d70 100644 --- a/x11-misc/gaia/ChangeLog +++ b/x11-misc/gaia/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/gaia # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/ChangeLog,v 1.5 2006/11/24 11:05:07 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/ChangeLog,v 1.6 2006/11/24 13:03:38 opfer Exp $ + + 24 Nov 2006; Christian Faulhammer <opfer@gentoo.org> + files/gaia-respect_CFLAGS.patch: + reworked patch with help of Marien Zwart <marienz@gentoo.org> 24 Nov 2006; Christian Faulhammer <opfer@gentoo.org> +files/gaia-respect_CFLAGS.patch, gaia-0.1.0.ebuild: diff --git a/x11-misc/gaia/files/gaia-respect_CFLAGS.patch b/x11-misc/gaia/files/gaia-respect_CFLAGS.patch index 197de21866e8..4208c8f82ccc 100644 --- a/x11-misc/gaia/files/gaia-respect_CFLAGS.patch +++ b/x11-misc/gaia/files/gaia-respect_CFLAGS.patch @@ -1,20 +1,13 @@ ---- SConstruct 2006-11-24 11:53:51.000000000 +0100 -+++ /tmp/SConstruct 2006-11-24 11:55:07.000000000 +0100 -@@ -1,4 +1,5 @@ - import os -+import re - - ####################################### - # OPTIONS -@@ -11,8 +12,9 @@ +--- /tmp/SConstruct 2006-11-24 13:55:00.000000000 +0100 ++++ SConstruct 2006-11-24 13:58:22.000000000 +0100 +@@ -11,8 +11,8 @@ ####################################### # ENVIRONMENT ####################################### -env = Environment( CCFLAGS = [ '-Wall', '-g' ], - CXXFLAGS = [ '-Wall', '-g' ], -+ -+env = Environment( CCFLAGS = re.split('\s+', os.environ.get('CFLAGS', '')), -+ CXXFLAGS = re.split('\s+', os.environ.get('CXXFLAGS', '')), ++env = Environment( CCFLAGS = [ os.environ.get('CFLAGS', '').split() ], ++ CXXFLAGS = [ os.environ.get('CXXFLAGS', '').split() ], CPPPATH = [ '/usr/local/include', '/usr/X11R6/include' ], LIBPATH = [ '/usr/X11R6/lib', '/usr/local/lib' ], options = opts ) |