From owner-svn-ports-head@freebsd.org Sat Aug 1 20:41:12 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5AFEC3A4D1D; Sat, 1 Aug 2020 20:41:12 +0000 (UTC) (envelope-from rene@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BJwzD1qkBz4fdb; Sat, 1 Aug 2020 20:41:12 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 228271846B; Sat, 1 Aug 2020 20:41:12 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 071KfCv9063856; Sat, 1 Aug 2020 20:41:12 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 071KfCGd063855; Sat, 1 Aug 2020 20:41:12 GMT (envelope-from rene@FreeBSD.org) Message-Id: <202008012041.071KfCGd063855@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Sat, 1 Aug 2020 20:41:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r543922 - head/www/chromium X-SVN-Group: ports-head X-SVN-Commit-Author: rene X-SVN-Commit-Paths: head/www/chromium X-SVN-Commit-Revision: 543922 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Aug 2020 20:41:12 -0000 Author: rene Date: Sat Aug 1 20:41:11 2020 New Revision: 543922 URL: https://svnweb.freebsd.org/changeset/ports/543922 Log: www/chromium: fix build when using Python 3.{x!=7} as default Submitted by: kib (private mail) MFH: 2020Q3 Modified: head/www/chromium/Makefile Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Sat Aug 1 19:14:10 2020 (r543921) +++ head/www/chromium/Makefile Sat Aug 1 20:41:11 2020 (r543922) @@ -256,12 +256,12 @@ pre-configure: ./build/linux/unbundle/replace_gn_files.py --system-libraries \ ffmpeg flac fontconfig freetype harfbuzz-ng libdrm libpng libwebp libxml libxslt openh264 opus snappy || ${FALSE} - # We need the site package from xcbgen, which installs as python3.7 (really: default version), while the chromium + # We need the site package from xcbgen, which installs as python3.x (really: default version), while the chromium # build still needs to use python2.7. It works, because xcbgen can run with both versions, but we want to avoid - # having the pre-compiled pyc files from 2.7 in the 3.7 site packages + # having the pre-compiled pyc files from 2.7 in the 3.x site packages # Remove this as soon as chromium uses python3.x as well @${MKDIR} ${WRKDIR}/site-packages/xcbgen - ${CP} ${PYTHONBASE}/lib/python3.7/site-packages/xcbgen/*.py \ + ${CP} ${PYTHONBASE}/lib/python${PYTHON_DEFAULT}/site-packages/xcbgen/*.py \ ${WRKDIR}/site-packages/xcbgen .endif