diff options
| author | Andreas Enge <andreas@enge.fr> | 2015-04-26 16:05:39 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2015-04-26 16:05:39 +0200 |
| commit | 003e8d5e04d4296a18a651bf2183335db87dca77 (patch) | |
| tree | f4ccbae91ef577f917d8e9441c66ef539d8f7f51 /gnu/packages/patches | |
| parent | f62a8417baf2a887bdbee951479889c8062c1f3d (diff) | |
| parent | f8f63893be97be8afc55668faa6601a24bb41e2d (diff) | |
| download | guix-003e8d5e04d4296a18a651bf2183335db87dca77.tar.gz | |
Merge branch 'wip-glib' into master.
Conflicts: gnu/packages/package-management.scm
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/gobject-introspection-cc.patch | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch index 38b919a746..d9cacf4ca7 100644 --- a/gnu/packages/patches/gobject-introspection-cc.patch +++ b/gnu/packages/patches/gobject-introspection-cc.patch @@ -1,14 +1,11 @@ ---- a/giscanner/sourcescanner.py 2013-12-15 23:03:54.002937000 +0100 -+++ b/giscanner/sourcescanner.py 2013-12-15 23:04:50.322937000 +0100 -@@ -277,6 +277,11 @@ - defines = ['__GI_SCANNER__'] - undefs = [] - cpp_args = os.environ.get('CC', 'cc').split() # support CC="ccache gcc" -+ if (cpp_args == ['cc'] and -+ not any(map(lambda x: os.access(os.path.join(x, 'cc'), os.X_OK), -+ os.environ.get('PATH').split(':')))): -+ cpp_args = ['GUIX_GCC_PATH'] -+ - if 'cl' in cpp_args: - # The Microsoft compiler/preprocessor (cl) does not accept - # source input from stdin (the '-' flag), so we need +Use gcc as the default C compiler if CC is not set. + + +--- gobject-introspection-1.44.0.orig/giscanner/__init__.py 2014-08-04 22:37:07.000000000 +0800 ++++ gobject-introspection-1.44.0/giscanner/__init__.py 2015-04-20 17:30:26.507697234 +0800 +@@ -22,3 +22,5 @@ + builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR') + if builddir is not None: + __path__.append(os.path.join(builddir, 'giscanner')) ++if not 'CC' in os.environ: ++ os.environ['CC'] = 'gcc' |