diff options
| author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2022-03-25 13:32:34 +0000 |
|---|---|---|
| committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2022-03-25 13:38:15 +0000 |
| commit | c06101388d9b11d27eaa376a1e9a31c164613161 (patch) | |
| tree | d36d5d463c135fd1213dacd59966da97455fa974 /games | |
| parent | 6fe883942dfe2e0498a4eb450d9df933a32e2f97 (diff) | |
| download | ports-c06101388d9b11d27eaa376a1e9a31c164613161.tar.gz ports-c06101388d9b11d27eaa376a1e9a31c164613161.zip | |
games/0ad: Fix build with setuptools 58.0.0+
With hat: python
Diffstat (limited to 'games')
| -rw-r--r-- | games/0ad/Makefile | 2 | ||||
| -rw-r--r-- | games/0ad/files/setuptools.diff | 19 |
2 files changed, 21 insertions, 0 deletions
diff --git a/games/0ad/Makefile b/games/0ad/Makefile index 721b123f2e9d..38835676fd5d 100644 --- a/games/0ad/Makefile +++ b/games/0ad/Makefile @@ -67,6 +67,8 @@ post-patch: -e '1441s/"execinfo",/& "ssp_nonshared",/' \ ${WRKSRC}/build/premake/premake5.lua .endif + @${ECHO_CMD} "patch < ../setuptools.diff" >> ${WRKSRC}/libraries/source/spidermonkey/patch.sh + @${CP} ${FILESDIR}/setuptools.diff ${WRKSRC}/libraries/source/spidermonkey/ pre-build: (cd ${WRKSRC}/build/workspaces && ${SETENV} ${MAKE_ENV} ./update-workspaces.sh --bindir=${PREFIX}/bin --datadir=${DATADIR} --libdir=${PREFIX}/lib/${PORTNAME}) diff --git a/games/0ad/files/setuptools.diff b/games/0ad/files/setuptools.diff new file mode 100644 index 000000000000..9cc0efb613c5 --- /dev/null +++ b/games/0ad/files/setuptools.diff @@ -0,0 +1,19 @@ +--- build/moz.configure/init.configure.orig 2020-11-28 16:33:01.000000000 +0000 ++++ build/moz.configure/init.configure 2022-03-22 20:13:07.253730000 +0000 +@@ -245,6 +245,7 @@ + @imports('sys') + @imports('subprocess') + @imports('distutils.sysconfig') ++@imports(_from='distutils', _import='sysconfig') + @imports(_from='mozbuild.configure.util', _import='LineIO') + @imports(_from='mozbuild.virtualenv', _import='VirtualenvManager') + @imports(_from='mozbuild.virtualenv', _import='verify_python_version') +@@ -375,7 +376,7 @@ + sys.exit(subprocess.call([python] + sys.argv)) + + # We are now in the virtualenv +- if not distutils.sysconfig.get_python_lib(): ++ if not sysconfig.get_python_lib(): + die('Could not determine python site packages directory') + + str_version = '.'.join(str(v) for v in version) |