From: Cyril Roelandt <tipecaml@gmail.com>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: guix-devel@gnu.org
Subject: Re: [PATCH 1/6] gnu: gobject-introspection: look for 'gcc' when no compiler seems available.
Date: Sun, 01 Dec 2013 04:15:33 +0100 [thread overview]
Message-ID: <529AA9D5.1070501@gmail.com> (raw)
In-Reply-To: <87iov9y2ib.fsf@gnu.org>
On 11/30/2013 10:59 PM, Ludovic Courtès wrote:
> Hello!
>
> Thanks for looking into this!
>
> Cyril Roelandt <tipecaml@gmail.com> skribis:
>
>> @@ -192,8 +193,8 @@ dynamic loading, and an object system.")
>> 'configure
>> (lambda* (#:key #:allow-other-keys #:rest args)
>> (let ((configure (assoc-ref %standard-phases 'configure)))
>> - ;; giscanner/sourcescanner.py looks for 'CC', let's set it here.
>> - (setenv "CC" "gcc")
>> + (substitute* "giscanner/sourcescanner.py"
>> + (("GUIX_GCC_PATH") (which "gcc")))
>> (apply configure args)))
>> %standard-phases)))
>> (home-page "https://wiki.gnome.org/GObjectIntrospection")
>> diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch
>> new file mode 100644
>> index 0000000..280c5d3
>> --- /dev/null
>> +++ b/gnu/packages/patches/gobject-introspection-cc.patch
>> @@ -0,0 +1,15 @@
>> +Try $CC, 'cc', and finally 'gcc'.
>> +--- a/giscanner/sourcescanner.py.orig 2013-10-16 03:41:25.381719000 +0200
>> ++++ b/giscanner/sourcescanner.py 2013-10-16 03:43:35.533719000 +0200
>> +@@ -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')))):
>> ++ cpp_args = ['GUIX_GCC_PATH']
>
> Wouldn’t it work to just do:
>
> (substitute* "giscanner/sourcescanner.py"
> (("'cc'") (which "gcc")))
>
> That way the patch wouldn’t even be needed.
>
> WDYT?
>
As I was saying in
https://lists.gnu.org/archive/html/guix-devel/2013-10/msg00167.html ,
I'd rather stick to what the program is supposed to do before trying
alternatives. I first try to use $CC, then 'cc', and finally (which "gcc").
Cyril.
next prev parent reply other threads:[~2013-12-01 3:14 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-30 1:13 [PATCH 0/6] Add eog Cyril Roelandt
2013-11-30 1:13 ` [PATCH 1/6] gnu: gobject-introspection: look for 'gcc' when no compiler seems available Cyril Roelandt
2013-11-30 21:59 ` Ludovic Courtès
2013-12-01 3:15 ` Cyril Roelandt [this message]
2013-12-01 22:11 ` Ludovic Courtès
2013-11-30 1:13 ` [PATCH 2/6] gnu: gtk+: enable introspection Cyril Roelandt
2013-11-30 22:01 ` Ludovic Courtès
2013-12-01 3:43 ` Cyril Roelandt
2013-12-01 22:12 ` Ludovic Courtès
2013-12-07 15:11 ` Cyril Roelandt
2013-12-07 15:27 ` Ludovic Courtès
2013-12-08 20:32 ` [PATCH 2/6 v2] " Cyril Roelandt
2013-12-08 23:53 ` Ludovic Courtès
2013-12-10 23:43 ` [PATCH 2/6 v3] " Cyril Roelandt
2013-12-11 21:09 ` Ludovic Courtès
2013-11-30 1:13 ` [PATCH 3/6] gnu: Add libpeas Cyril Roelandt
2013-11-30 22:03 ` Ludovic Courtès
2013-12-01 3:45 ` Cyril Roelandt
2013-12-01 22:13 ` Ludovic Courtès
2013-12-08 20:33 ` [PATCH 3/6 v2] " Cyril Roelandt
2013-12-08 23:55 ` Ludovic Courtès
2013-12-10 23:44 ` [PATCH 3/6 v6] " Cyril Roelandt
2013-12-11 21:10 ` Ludovic Courtès
2013-11-30 1:13 ` [PATCH 4/6] gnu: Add iso-codes Cyril Roelandt
2013-11-30 22:05 ` Ludovic Courtès
2013-12-01 3:47 ` Cyril Roelandt
2013-12-01 22:13 ` Ludovic Courtès
2013-12-08 20:33 ` [PATCH 4/6 v2] " Cyril Roelandt
2013-12-08 23:55 ` Ludovic Courtès
2013-11-30 1:13 ` [PATCH 5/6] gnu: Add gnome-desktop Cyril Roelandt
2013-11-30 22:07 ` Ludovic Courtès
2013-12-08 20:34 ` [PATCH 5/6 v2] " Cyril Roelandt
2013-12-08 23:57 ` Ludovic Courtès
2013-12-09 0:06 ` Cyril Roelandt
2013-12-09 17:34 ` Ludovic Courtès
2013-12-10 23:44 ` [PATCH 5/6 v3] " Cyril Roelandt
2013-12-11 21:11 ` Ludovic Courtès
2013-12-12 6:07 ` John Darrington
2013-12-12 21:22 ` Ludovic Courtès
2013-11-30 1:13 ` [PATCH 6/6] gnu: Add eog Cyril Roelandt
2013-11-30 22:06 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=529AA9D5.1070501@gmail.com \
--to=tipecaml@gmail.com \
--cc=guix-devel@gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.