Charlene Wendling <[email protected]> writes:
> Hi, > > On Thu, 17 Jun 2021 09:56:27 +0100 > Stuart Henderson <[email protected]> wrote: > >> PowerPC doesn't have those either > > But it doesn't need to, because embree is not built on all 32 bit > arches [0] due to a lack of "consumers" [1] :) > > You may be able to see that in the i386 build logs but here is the > powerpc one [2] (beware, heavy!). > > [0] https://github.com/godotengine/godot/issues/48482 > [1] https://github.com/godotengine/godot/pull/48483/commits/e53422c8 > [2] https://bin.charlenew.xyz/godot.log I took a look at this. Building with builtin_embree=no doesn't disable embree (as expected), so I tried to mess around with scons and disable the build of modules/lightmapper_cpu and modules/raycast. The attached patch should disable the build of those two modules on mips64 and sparc64, hopefully allowing them to complete the build. (I had to go SUBST_CMD route because `platform' is always a useless "x11" and env doesn't contain something that resambles the current architecture) The other way is to mark it as NOT_FOR_ARCH="mips64 sparc64", I'm fine with either. Index: Makefile =================================================================== RCS file: /home/cvs/ports/games/godot/Makefile,v retrieving revision 1.20 diff -u -p -r1.20 Makefile --- Makefile 9 Jun 2021 19:50:07 -0000 1.20 +++ Makefile 21 Jun 2021 08:09:30 -0000 @@ -88,6 +88,8 @@ post-extract: pre-configure: ${SUBST_CMD} ${WRKSRC}/drivers/unix/os_unix.cpp + ${SUBST_CMD} ${WRKSRC}/modules/raycast/config.py + ${SUBST_CMD} ${WRKSRC}/modules/lightmapper_cpu/config.py do-install: ${INSTALL_PROGRAM} ${WRKBUILD}/bin/godot* \ Index: patches/patch-modules_lightmapper_cpu_config_py =================================================================== RCS file: patches/patch-modules_lightmapper_cpu_config_py diff -N patches/patch-modules_lightmapper_cpu_config_py --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-modules_lightmapper_cpu_config_py 21 Jun 2021 08:09:05 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ + +embree doesn't support non-amd/arm 64bit arches + +Index: modules/lightmapper_cpu/config.py +--- modules/lightmapper_cpu/config.py.orig ++++ modules/lightmapper_cpu/config.py +@@ -1,4 +1,7 @@ + def can_build(env, platform): ++ if "${MACHINE_ARCH}" in ["mips64", "sparc64"]: ++ return False ++ + if not env["tools"] or not env["module_raycast_enabled"]: + return False + Index: patches/patch-modules_raycast_config_py =================================================================== RCS file: patches/patch-modules_raycast_config_py diff -N patches/patch-modules_raycast_config_py --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-modules_raycast_config_py 21 Jun 2021 08:07:51 -0000 @@ -0,0 +1,15 @@ +$OpenBSD$ + +embree doesn't support non-amd/arm 64bit arches + +Index: modules/raycast/config.py +--- modules/raycast/config.py.orig ++++ modules/raycast/config.py +@@ -1,4 +1,7 @@ + def can_build(env, platform): ++ if "${MACHINE_ARCH}" in ["mips64", "sparc64"]: ++ return False ++ + if not env["tools"]: + return False +
