After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 418855 - tarball and mozilla modules don't respect makeargs
tarball and mozilla modules don't respect makeargs
Status: RESOLVED FIXED
Product: jhbuild
Classification: Infrastructure
Component: general
unspecified
Other Linux
: Normal normal
: ---
Assigned To: Jhbuild maintainers
Jhbuild QA
Depends on:
Blocks:
 
 
Reported: 2007-03-16 05:45 UTC by James Andrewartha
Modified: 2007-03-16 08:55 UTC
See Also:
GNOME target: ---
GNOME version: ---



Description James Andrewartha 2007-03-16 05:45:33 UTC
I think at some point makeargs got changed into config.makeargs, but tarball.py and mozillamodule.py didn't get updated. The following patch fixes this:

Index: mozillamodule.py
===================================================================
--- mozillamodule.py    (revision 1428)
+++ mozillamodule.py    (working copy)
@@ -170,7 +170,7 @@
     revision = config.branches.get(name, revision)
     autogenargs += ' ' + config.module_autogenargs.get(name,
                                                        config.autogenargs)
-    makeargs += ' ' + config.module_makeargs.get(name, makeargs)
+    makeargs += ' ' + config.module_makeargs.get(name, config.makeargs)

     dependencies, after = get_dependencies(node)

Index: tarball.py
===================================================================
--- tarball.py  (revision 1428)
+++ tarball.py  (working copy)
@@ -259,7 +259,7 @@

     autogenargs += ' ' + config.module_autogenargs.get(name,
                                                        config.autogenargs)
-    makeargs += ' ' + config.module_makeargs.get(name, makeargs)
+    makeargs += ' ' + config.module_makeargs.get(name, config.makeargs)

     # for tarballs, don't ever pass --enable-maintainer-mode
     autogenargs = autogenargs.replace('--enable-maintainer-mode', '')
Comment 1 Frederic Peters 2007-03-16 08:55:00 UTC
Thanks, I just commited the fix.

2007-03-16  Frederic Peters  <fpeters@0d.be>

        * jhbuild/modtypes/tarball.py, jhbuild/modtype/mozillamodule.py: use
        config.makeargs (closes: #418855, patch by James Andrewartha)