CVS commit: pkgsrc/lang/mozjs60

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Thu May 28 15:26:23 UTC 2020

Modified Files:
        pkgsrc/lang/mozjs60: distinfo
Added Files:
        pkgsrc/lang/mozjs60/patches:
            patch-.._.._python_mozbuild_mozbuild_virtualenv.py

Log Message:
mozjs60: fix configuration failure

The added patch hacks the virtualenv configuration process which sometimes
finds invalid modification times and try to restart a broken configuration.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/mozjs60/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/lang/mozjs60/patches/patch-.._.._python_mozbuild_mozbuild_virtualenv.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/mozjs60/distinfo
diff -u pkgsrc/lang/mozjs60/distinfo:1.5 pkgsrc/lang/mozjs60/distinfo:1.6
--- pkgsrc/lang/mozjs60/distinfo:1.5    Thu May 14 08:42:22 2020
+++ pkgsrc/lang/mozjs60/distinfo        Thu May 28 15:26:23 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2020/05/14 08:42:22 rin Exp $
+$NetBSD: distinfo,v 1.6 2020/05/28 15:26:23 triaxx Exp $
 
 SHA1 (mozjs60_60.8.0.orig.tar.xz) = b66207ee477c110995029f173e6b026f2e013591
 RMD160 (mozjs60_60.8.0.orig.tar.xz) = fef033969a51dc56c84669d33401f60bd499de6d
@@ -6,6 +6,7 @@ SHA512 (mozjs60_60.8.0.orig.tar.xz) = ad
 Size (mozjs60_60.8.0.orig.tar.xz) = 25294372 bytes
 SHA1 (patch-.._.._config_rules.mk) = cf3421d991e1cbfab4c0cdcb7b648b1388fa32d5
 SHA1 (patch-.._.._python_mozbuild_mozbuild_backend_recursivemake.py) = dda670432e5673c5d28dcf6c4902d4a724e71170
+SHA1 (patch-.._.._python_mozbuild_mozbuild_virtualenv.py) = 231d96ae8f66da1db36a4371c28d97a4db4c0f5c
 SHA1 (patch-.._public_TypeDecls.h) = 846e0707755cbe7e97cc380f66bfe6da0daf996e
 SHA1 (patch-gc_Memory.cpp) = ba865bee4b99ce6298404b41b465b281fd23555f
 SHA1 (patch-jsdate.cpp) = f9314460476ffbc00fe85a75bddc964807d0153f

Added files:

Index: pkgsrc/lang/mozjs60/patches/patch-.._.._python_mozbuild_mozbuild_virtualenv.py
diff -u /dev/null pkgsrc/lang/mozjs60/patches/patch-.._.._python_mozbuild_mozbuild_virtualenv.py:1.1
--- /dev/null   Thu May 28 15:26:23 2020
+++ pkgsrc/lang/mozjs60/patches/patch-.._.._python_mozbuild_mozbuild_virtualenv.py      Thu May 28 15:26:23 2020
@@ -0,0 +1,20 @@
+$NetBSD: patch-.._.._python_mozbuild_mozbuild_virtualenv.py,v 1.1 2020/05/28 15:26:23 triaxx Exp $
+
+Remove a test that drives the Python environment to be reduilt during the
+configure step. This bug is related to PR pkg/54878.
+
+--- ../../python/mozbuild/mozbuild/virtualenv.py.orig  2019-07-01 11:07:46.000000000 +0200
++++ ../../python/mozbuild/mozbuild/virtualenv.py
+@@ -122,12 +122,6 @@
+ 
+             return False
+ 
+-        # check modification times
+-        activate_mtime = os.path.getmtime(self.activate_path)
+-        dep_mtime = max(os.path.getmtime(p) for p in deps)
+-        if dep_mtime > activate_mtime:
+-            return False
+-
+         # Verify that the Python we're checking here is either the virutalenv
+         # python, or we have the Python version that was used to create the
+         # virtualenv. If this fails, it is likely system Python has been