diff options
| author | triaxx <triaxx@pkgsrc.org> | 2020-05-28 15:26:23 +0000 |
|---|---|---|
| committer | triaxx <triaxx@pkgsrc.org> | 2020-05-28 15:26:23 +0000 |
| commit | fefe0dbd6b4fe319d55ea51ee2784cd68a1982dd (patch) | |
| tree | c1d9d6f5ba02bdeea562bca90e00b314f821136c /lang/mozjs60 | |
| parent | 00a3ea578fe0a0882595ed965198f6ed2f3f6594 (diff) | |
| download | pkgsrc-fefe0dbd6b4fe319d55ea51ee2784cd68a1982dd.tar.gz | |
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.
Diffstat (limited to 'lang/mozjs60')
| -rw-r--r-- | lang/mozjs60/distinfo | 3 | ||||
| -rw-r--r-- | lang/mozjs60/patches/patch-.._.._python_mozbuild_mozbuild_virtualenv.py | 20 |
2 files changed, 22 insertions, 1 deletions
diff --git a/lang/mozjs60/distinfo b/lang/mozjs60/distinfo index 3dda7ced151..31b2fbdf8cc 100644 --- a/lang/mozjs60/distinfo +++ b/lang/mozjs60/distinfo @@ -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) = ad4d5d17824b1d0e50fc43a56cb5ffe022ffd150ce 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 diff --git a/lang/mozjs60/patches/patch-.._.._python_mozbuild_mozbuild_virtualenv.py b/lang/mozjs60/patches/patch-.._.._python_mozbuild_mozbuild_virtualenv.py new file mode 100644 index 00000000000..dfbd88be0f5 --- /dev/null +++ b/lang/mozjs60/patches/patch-.._.._python_mozbuild_mozbuild_virtualenv.py @@ -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 |