[mw-devel] [Git][arthur/mw][master] 2 commits: Fix mozjs build on Fedora 24

[Andrew Price]

Andrew Price pushed to branch master at Justin Mitchell / mw


Commits:
b90c91d7 by Andrew Price at 2016-06-13T11:11:10+01:00
Fix mozjs build on Fedora 24

- - - - -
ec8ad16a by Andrew Price at 2016-06-13T11:18:24+01:00
Fix client build on Fedora 24

js.c:17:32: error: option ‘-Winvalid-offsetof’ is valid for C++/ObjC++ but not for C [-Werror=pragmas]
 #pragma GCC diagnostic ignored "-Winvalid-offsetof"
                                ^~~~~~~~~~~~~~~~~~~~
js.c:21:32: error: option ‘-Winvalid-offsetof’ is valid for C++/ObjC++ but not for C [-Werror=pragmas]
 #pragma GCC diagnostic warning "-Winvalid-offsetof"
                                ^~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
../../Makefile.common:104: recipe for target 'js.o' failed

- - - - -


2 changed files:

- mozjs/mozjs17.0.0/js/src/config/milestone.pl
- src/client/js.c


Changes:

=====================================
mozjs/mozjs17.0.0/js/src/config/milestone.pl
=====================================
--- a/mozjs/mozjs17.0.0/js/src/config/milestone.pl
+++ b/mozjs/mozjs17.0.0/js/src/config/milestone.pl
@@ -55,7 +55,7 @@ $MILESTONE_FILE  = "$TOPSRCDIR/config/milestone.txt";
 #
 my $milestone = Moz::Milestone::getOfficialMilestone($MILESTONE_FILE);
 
-if (defined(@TEMPLATE_FILE)) {
+if (@TEMPLATE_FILE) {
   my $TFILE;
 
   foreach $TFILE (@TEMPLATE_FILE) {


=====================================
src/client/js.c
=====================================
--- a/src/client/js.c
+++ b/src/client/js.c
@@ -14,11 +14,9 @@
 /* Ugly but necessary (this is how gjs shuts up the warnings,
    only gcc 4.6 has a nicer (push/pop) way to do it */
 #pragma GCC diagnostic ignored "-Wstrict-prototypes"
-#pragma GCC diagnostic ignored "-Winvalid-offsetof"
 #pragma GCC diagnostic ignored "-Wbad-function-cast"
 #include <jsdbgapi.h>
 #pragma GCC diagnostic warning "-Wbad-function-cast"
-#pragma GCC diagnostic warning "-Winvalid-offsetof"
 #pragma GCC diagnostic warning "-Wstrict-prototypes"
 
 #include <sqlite.h>



View it on GitLab: https://projects.sucs.org/arthur/mw/compare/fc0e051a60d35ac0e9b55b18d39c9d60b9cd5ce6...ec8ad16a4a1874ca711751bd5647d87e064e3346
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/mw-devel/attachments/20160613/f7c6633e/attachment-0001.html>