From nobody Mon Oct 30 18:37:18 2023 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 4SK27L4mYdz4yGSm; Mon, 30 Oct 2023 18:37:18 +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 4SK27L4HfYz3cbW; Mon, 30 Oct 2023 18:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698691038; 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=BqySATIKzzGfKi60UhDXjGRTFyqnqipEXSyhHcHdZ9U=; b=MAGC3PbGRNgpiQ92v2aIvSKVvCyvT/h59IAtVsQVsdMGGhVVIlMVXwC3LMnPvc6DKW29Hz Zs5WEPq8Tc1oI+VoMn2+6+/jVU/RTvDGkLp+pLK0iy45XQBfszujHEOUEIoa1ka+HUAJMr A09y4iEKWVnuf5zpIe5jX1Snaw/ZAuKh667b1IZ53rkhN8fHtwbvBOxg/Bz+JX0fg6Cren r4mGVKZEdCZrw3NOeJv7cPzwovLSccNTKejs/acOw44YLrsUmy8KPFLCrwwIGJL5KSrBWF 2KkBs6hq6FYqxQkA6395nta9T6fIUo9t+FXnmWCYy00DgTUlNZkaGwfdm+N2CQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698691038; 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=BqySATIKzzGfKi60UhDXjGRTFyqnqipEXSyhHcHdZ9U=; b=JUW42nT0D7/Bi9JXGcZ1bUR93C6dKHWPo70ahPJMEt3hhuGg3vF+qzMIRcQQBiO1aAgyd8 ko1+Azsy393WBTk0xDZ7t47cJ6TSRMR1O84L0DtV473z/W+5t5ZFfRFRhzzYZjlWyT2wZn MnimUhIHEpYH8YCQ5jWqCkp9RxQvOBHTWi8GzrHeKMqhdP4geI8izK11xqC6UF0msf2HDx PX3c0U6MtGIYBHfWDJWZ3vxqK1P+DV5bs14fzzOyDKsOWZrAuRitgwf4prxovehpv4WNCw UOxcB+PdVlyPag1VqWKaa4X/7oEPTILvCr0DhkmqH4IymheFbEvp+Sc33wzq9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698691038; a=rsa-sha256; cv=none; b=n8xqLYE8Z6hIZOmcQzWAOoeR06oPqLudnmaqT69VOsWAo0ZH0CKTmGGi7zcqmUlwUtQVXl xtAI8aV8C84b6cSOrUoRs6CX30Z90ICjOflWA2NtLWohRnyTh8pad9EnfeVnawGshqpdIU VnNYYrNbb8t1WgHXNUzLmQTfw4CWswoAs0FnBCN2He8O6qU5YI7w6KUwLYRHM4WYTTz/yA F1GQhmjGQY8IsFPjIu67EtFkufVFz//Wz9kb0ZirmlGECMLDboiGFRm6O5SyYbKpdZsV11 SH8N6CXzrJaVw7bwa8iiOyKzGyb3ktPAtpMW2KFGVsWIFvPWCA6n6Dz25I2qUA== 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 4SK27L34GzzXT3; Mon, 30 Oct 2023 18:37:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39UIbIeB096215; Mon, 30 Oct 2023 18:37:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UIbIE4096212; Mon, 30 Oct 2023 18:37:18 GMT (envelope-from git) Date: Mon, 30 Oct 2023 18:37:18 GMT Message-Id: <202310301837.39UIbIE4096212@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 7b0de35cb0c2 - main - graphics/py-mayavi: Fix build on some systems 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b0de35cb0c207c4dc7a14a0015a89369101753b Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b0de35cb0c207c4dc7a14a0015a89369101753b commit 7b0de35cb0c207c4dc7a14a0015a89369101753b Author: Yuri Victorovich AuthorDate: 2023-10-30 18:35:10 +0000 Commit: Yuri Victorovich CommitDate: 2023-10-30 18:37:16 +0000 graphics/py-mayavi: Fix build on some systems ... by preventing tvtk_classes.zip rebuild. Such rebuild causes failure, and it is also conditional on file time comparison. Accepting the pre-existing tvtk_classes.zip prevents such rebuild, which hopefully would prevent build failured. Reported by: fallout --- graphics/py-mayavi/files/patch-setup.py | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/graphics/py-mayavi/files/patch-setup.py b/graphics/py-mayavi/files/patch-setup.py index 310be4df1bed..e005fa7e1a0d 100644 --- a/graphics/py-mayavi/files/patch-setup.py +++ b/graphics/py-mayavi/files/patch-setup.py @@ -1,6 +1,21 @@ ---- setup.py.orig 2016-08-01 19:02:36 UTC +- The first patch is to fix build by accepting tvtk_classes.zip, +- otherwise the build SEGVs on some platforms. +- Rebuilding tvtk_classes.zip seems to cause SEGVs. + +- Misc other patches. + +--- setup.py.orig 2022-10-17 14:42:18 UTC +++ setup.py -@@ -403,12 +403,12 @@ def configuration(parent_package=None, t +@@ -260,7 +260,7 @@ def _tvtk_built_recently(zipfile, delay): + def build_tvtk_classes_zip(): + MY_DIR = os.path.dirname(__file__) + zipfile = os.path.join(MY_DIR, 'tvtk', 'tvtk_classes.zip') +- if _tvtk_built_recently(zipfile, delay=120): ++ if True or _tvtk_built_recently(zipfile, delay=120): + print("Already built tvtk_classes.zip") + return + else: +@@ -378,12 +378,12 @@ def configuration(parent_package=None, top_path=None): config.add_data_dir('mayavi/core/lut') config.add_data_dir('mayavi/tests/data') config.add_data_dir('mayavi/tests/csv_files') @@ -11,7 +26,7 @@ for pkgdir in ('mayavi', 'tvtk'): for root, dirs, files in os.walk(pkgdir): - if split(root)[-1] == 'images': -+ if (split(root)[-1] == 'images') and files: ++ if split(root)[-1] == 'images' and files: config.add_data_dir(root) # *.ini files.