mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

games/0ad: Fix build with setuptools 58.0.0+

Browse Source 
With hat:	python
This commit is contained in:
Po-Chuan Hsieh 2022-03-25 21:32:34 +08:00
parent 6fe883942d
commit c06101388d
No known key found for this signature in database
GPG Key ID: 9A4BD10F002DD04B
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
games/0ad/Makefile
View File

@ -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})

19
games/0ad/files/setuptools.diff Normal file
View File

@ -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)