Mozilla help needed - 0ad, or: how to pass the version to mozjs-38?

[ng0]

These 3 patches are also in the games/0ad branch here https://pagure.io/guix-dev

No matter what I try, mozjs-38 ends up without a version in some parts and I 
need this to continue (finish) the 0ad package.
Any help is welcome.


Linking mocks_real
ar -rcs ../../../binaries/system/libmocks_real.a 
obj/mocks_real_Release/mocks_real.o 
==== Building network (release) ====
Creating obj/network_Release
mkdir -p obj/network_Release
precompiled.h
cp ../../../source/pch/network/precompiled.h obj/network_Release
g++ -MMD -MP -DNDEBUG -DCONFIG_FINAL=1 -DLIB_STATIC_LINK -DUSING_PCH 
-I../../../source/pch/network -I../../../source -I/usr/X11R6/include/X11 
-I/usr/X11R6/include -I/usr/local/include/X11 -I/usr/local/include 
-I/usr/include/X11 -std=c++0x -fvisibility=hidden `pkg-config js --cflags` -x 
c++-header -o "obj/network_Release/precompiled.h.gch" -c 
"../../../source/pch/network/precompiled.h"
NetStats.cpp
g++ -Iobj/network_Release -include obj/network_Release/precompiled.h -MMD -MP 
-DNDEBUG -DCONFIG_FINAL=1 -DLIB_STATIC_LINK -DUSING_PCH 
-I../../../source/pch/network -I../../../source -I/usr/X11R6/include/X11 
-I/usr/X11R6/include -I/usr/local/include/X11 -I/usr/local/include 
-I/usr/include/X11 -std=c++0x -fvisibility=hidden `pkg-config js --cflags` -MF 
obj/network_Release/NetStats.d -MT "obj/network_Release/NetStats.o" -o 
"obj/network_Release/NetStats.o" -c "../../../source/network/NetStats.cpp"
fsm.cpp
g++ -Iobj/network_Release -include obj/network_Release/precompiled.h -MMD -MP 
-DNDEBUG -DCONFIG_FINAL=1 -DLIB_STATIC_LINK -DUSING_PCH 
-I../../../source/pch/network -I../../../source -I/usr/X11R6/include/X11 
-I/usr/X11R6/include -I/usr/local/include/X11 -I/usr/local/include 
-I/usr/include/X11 -std=c++0x -fvisibility=hidden `pkg-config js --cflags` -MF 
obj/network_Release/fsm.d -MT "obj/network_Release/fsm.o" -o 
"obj/network_Release/fsm.o" -c "../../../source/network/fsm.cpp"
NetTurnManager.cpp
g++ -Iobj/network_Release -include obj/network_Release/precompiled.h -MMD -MP 
-DNDEBUG -DCONFIG_FINAL=1 -DLIB_STATIC_LINK -DUSING_PCH 
-I../../../source/pch/network -I../../../source -I/usr/X11R6/include/X11 
-I/usr/X11R6/include -I/usr/local/include/X11 -I/usr/local/include 
-I/usr/include/X11 -std=c++0x -fvisibility=hidden `pkg-config js --cflags` -MF 
obj/network_Release/NetTurnManager.d -MT "obj/network_Release/NetTurnManager.o" 
-o "obj/network_Release/NetTurnManager.o" -c 
"../../../source/network/NetTurnManager.cpp"
In file included from ../../../source/scriptinterface/ScriptInterface.h:26:0,
                 from 
../../../source/simulation2/helpers/SimulationCommand.h:21,
                 from ../../../source/network/NetTurnManager.h:21,
                 from ../../../source/network/NetTurnManager.cpp:20:
../../../source/scriptinterface/ScriptTypes.h:74:25: error: operator '!=' has 
no left operand
 #if MOZJS_MAJOR_VERSION != 38
                         ^
../../../source/scriptinterface/ScriptTypes.h:82:25: error: operator '!=' has 
no left operand
 #if MOZJS_MINOR_VERSION != 3
                         ^
In file included from 
/gnu/store/iwgi9001dmmihrjg4rqhd6pa6788prjw-glibc-2.24/include/signal.h:316:0,
                 from 
/gnu/store/y1g6991kxvdk4vxhsq07r5saww30v8dq-gcc-4.9.4/include/c++/csignal:42,
                 from ../../../source/lib/pch/pch_stdlib.h:37,
                 from ../../../source/lib/precompiled.h:103,
                 from ../../../source/pch/network/precompiled.h:19:
/gnu/store/9vn87bm1872c6b9w4lpqnm5ckx5h6gia-mozjs-38.2.1.rc0/include/mozjs-/jspubtd.h:459:74:
 warning: invalid access to non-static data member 
‘js::PerThreadDataFriendFields::RuntimeDummy::mainThread’  of NULL object 
[-Winvalid-offsetof]
     static const size_t RuntimeMainThreadOffset = offsetof(RuntimeDummy, 
mainThread);
                                                                          ^
/gnu/store/9vn87bm1872c6b9w4lpqnm5ckx5h6gia-mozjs-38.2.1.rc0/include/mozjs-/jspubtd.h:459:74:
 warning: (perhaps the ‘offsetof’ macro was used incorrectly) 
[-Winvalid-offsetof]
make[1]: *** [network.make:202: obj/network_Release/NetTurnManager.o] Error 1
make: *** [Makefile:21: network] Error 2
make: Leaving directory 
'/tmp/guix-build-0ad-0.0.21-alpha.drv-0/0ad-0.0.21-alpha/build/workspaces/gcc'
phase `build' failed after 8.8 seconds
builder for `/gnu/store/122kd4f8ygnhwzwki437kx2hrp2mj40q-0ad-0.0.21-alpha.drv' 
failed with exit code 1
@ build-failed /gnu/store/122kd4f8ygnhwzwki437kx2hrp2mj40q-0ad-0.0.21-alpha.drv 
- 1 builder for 
`/gnu/store/122kd4f8ygnhwzwki437kx2hrp2mj40q-0ad-0.0.21-alpha.drv' failed with 
exit code 1
guix build: error: build failed: build of 
`/gnu/store/122kd4f8ygnhwzwki437kx2hrp2mj40q-0ad-0.0.21-alpha.drv' failed