From nobody Fri Mar 25 13:50:29 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3136C1A3441A; Fri, 25 Mar 2022 13:50:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KQ3Py0V4cz3RCN; Fri, 25 Mar 2022 13:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3uqoQj36JuOtuL7aKASjH0UQvnBO1s+6SjmG+gW9w2g=; b=dXwLQQnXuyhpG4ifouTTyB2vAI1QhvJ/ppapUtiAr/ooINM9TbKm6BbFw0jdAnPKgC9Fcf r/IIKYOEQvLPL7xUBCjTGfbF7fNROBAMmU1waoU4kahzHEm2sGkum0whoNW82pXH9yr68A JJruKoTDl9OJjyvwjlxJy81V23/Q1c5q7T8sO91AxFdOezw2hkqOE3YbqEz65SrXOSBNPo C+GxJZziS6nil4IjX7u4PFt15QRsh25ATgKIdKol/lvNc/ly55SvP8z8X2PgOERzVs4UG4 XTbWGkpLIt+GSI0+rjEHDzFHGk6HLqp86ZjwZPBPdF77hfi+z+LZDAe+DZTSTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9921B5986; Fri, 25 Mar 2022 13:50:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22PDoTsx037009; Fri, 25 Mar 2022 13:50:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22PDoT1x037008; Fri, 25 Mar 2022 13:50:29 GMT (envelope-from git) Date: Fri, 25 Mar 2022 13:50:29 GMT Message-Id: <202203251350.22PDoT1x037008@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: c06101388d9b - main - games/0ad: Fix build with setuptools 58.0.0+ List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c06101388d9b11d27eaa376a1e9a31c164613161 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648216230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3uqoQj36JuOtuL7aKASjH0UQvnBO1s+6SjmG+gW9w2g=; b=QGzXPlM3SpsBx/i8tIxEpsDuDFdwHOqMcrzCUsi8cNEqUWlSbJaNuB+bWw5HwWiXHjGwrX Y1jv+PR8M0JxfylwQbZlD2c+KX/QfDBJhR7cdUhC0jwmzeXrg1Jk+aT5WCq1/N6zJtpWBx vSqc4uZZ5TTwaZlbNbDE/s+qBza8fC2n0y3T70DxWryeTKIieRXWV+/e1hGJL9/6QM3FYJ RxdvxCgVrocmmyrpx75BeGjLBJxMZ7itktHm8qPY+UMXPPtbjVVOrYDh06kXIZOOm/VCng OlvmFBjXSHm3hIm3pG8oOfNlzvdYOHSgNYZQdRuDNBlJ7rIayQ3OqO1YP/3bfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648216230; a=rsa-sha256; cv=none; b=p26DqUKLqPNGe43oPzdG/CzlIXZ4Jx1o0MtaUb4HjFo1jLtPlEAUuJqfGddF4jtYpkOF0F qPgM7wy1p/koPMWPCSzm+TaUtyBP6T4/qvCElohEpExrSdIy5hN1528+eQMwP2tp03LiqN T6WxoD+MRRtPL5xGHxQ7gichNVa6v/GAqwJiSrlhWnActT0FSb1riEauaTfNI9ra2NdUS5 BSIy4RsB+9lieRHna8oJY4X0lX/An3YsIj54B41r6Bxmg3a6bFNa44UjsLT1PioTNZ+JeA 8IXwOc2MXdSBp/SFqF/4d7/cADIEoFAAFtCk/Seik/uzCs3HSL0PHgPKGAmYkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=c06101388d9b11d27eaa376a1e9a31c164613161 commit c06101388d9b11d27eaa376a1e9a31c164613161 Author: Po-Chuan Hsieh AuthorDate: 2022-03-25 13:32:34 +0000 Commit: Po-Chuan Hsieh CommitDate: 2022-03-25 13:38:15 +0000 games/0ad: Fix build with setuptools 58.0.0+ With hat: python --- games/0ad/Makefile | 2 ++ games/0ad/files/setuptools.diff | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) 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)