pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/mozjs78 mozjs78: Fix Python dependencies. Add py-...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/965b1acc235c
branches:  trunk
changeset: 441860:965b1acc235c
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Nov 12 10:26:54 2020 +0000

description:
mozjs78: Fix Python dependencies. Add py-expat.

diffstat:

 lang/mozjs78/Makefile |  14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diffs (29 lines):

diff -r 938b304b9c89 -r 965b1acc235c lang/mozjs78/Makefile
--- a/lang/mozjs78/Makefile     Thu Nov 12 10:06:04 2020 +0000
+++ b/lang/mozjs78/Makefile     Thu Nov 12 10:26:54 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/11/10 11:27:10 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/11/12 10:26:54 nia Exp $
 
 DISTNAME=      mozjs78_78.4.0.orig
 PKGNAME=       ${DISTNAME:S/_/-/:S/.orig//}
@@ -38,16 +38,10 @@
 PKGCONFIG_OVERRIDE+=   build/js.pc.in
 PKGCONFIG_OVERRIDE+=   ctypes/libffi/libffi.pc.in
 
-# Python 2.7 and Python 3.6 or later are required simultaneously.
-PYTHON_VERSIONS_ACCEPTED=      27
+PYTHON_VERSIONS_INCOMPATIBLE=  27
 PYTHON_FOR_BUILD_ONLY=         tool
-.if !empty(PYTHON_VERSION_DEFAULT:M3[6789])
-TOOL_DEPENDS+=                 python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
-ALL_ENV+=                      PYTHON3=${PREFIX}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./}
-.else
-TOOL_DEPENDS+=                 python37-[0-9]*:../../lang/python37
-ALL_ENV+=                      PYTHON3=${PREFIX}/bin/python3.7
-.endif
+TOOL_DEPENDS+=                 ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+ALL_ENV+=                      PYTHON3=${PYTHONBIN}
 
 pre-configure:
        cd ${WRKSRC} && autoconf-2.13 old-configure.in > old-configure \



Home | Main Index | Thread Index | Old Index