pkgsrc-Changes archive

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

CVS commit: pkgsrc/chat/mumble



Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Apr 28 05:46:27 UTC 2020

Modified Files:
        pkgsrc/chat/mumble: Makefile

Log Message:
chat/mumble: needs python as tool

Otherwise configure fails with:

   ...
   Reading /tmp/pkgbuild/2020Q1/chat/mumble/work/mumble-1.3.0/src/mumble/mumble.pro
   Project ERROR: Unable to find the system's Python binary. Some scripts invoked during the Mumble build use Python. You can manually specify it via the MUMBLE_PYTHON environment variable (either 2 
or 3).


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/chat/mumble/Makefile

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

Modified files:

Index: pkgsrc/chat/mumble/Makefile
diff -u pkgsrc/chat/mumble/Makefile:1.16 pkgsrc/chat/mumble/Makefile:1.17
--- pkgsrc/chat/mumble/Makefile:1.16    Sun Apr 12 08:28:21 2020
+++ pkgsrc/chat/mumble/Makefile Tue Apr 28 05:46:27 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/04/12 08:28:21 adam Exp $
+# $NetBSD: Makefile,v 1.17 2020/04/28 05:46:27 riastradh Exp $
 
 DISTNAME=      mumble-1.3.0
 PKGREVISION=   7
@@ -16,6 +16,9 @@ USE_TOOLS+=   pkg-config gmake
 USE_LANGUAGES= c c++11
 USE_LIBTOOL=   yes
 
+PYTHON_FOR_BUILD_ONLY= tool
+CONFIGURE_ENV+=                MUMBLE_PYTHON=${PYTHONBIN:Q}
+
 BUILD_TARGET=  release
 
 # C++11
@@ -61,7 +64,7 @@ INSTALLATION_DIRS+=   share/pixmaps
 INSTALLATION_DIRS+=    ${PKGMANDIR}/man1
 
 do-configure:
-       cd ${WRKSRC} && ${QTDIR}/bin/qmake -unix -recursive main.pro \
+       cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QTDIR}/bin/qmake -unix -recursive main.pro \
            ${CONFIG_OPTIONS} ${MAKE_ENV} \
            QMAKE_CFLAGS=${CFLAGS:Q} \
            QMAKE_CXXFLAGS=${CXXFLAGS:Q} \
@@ -104,6 +107,7 @@ do-install:
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../devel/protobuf/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../lang/python/pyversion.mk"
 .include "../../net/mDNSResponder/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"



Home | Main Index | Thread Index | Old Index