pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/chat/swift swift: switch to building using its own scons



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c8dec40e91b5
branches:  trunk
changeset: 369784:c8dec40e91b5
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Oct 04 20:37:40 2017 +0000

description:
swift: switch to building using its own scons

scons-3.x is too new for this and needs too many fixes.

diffstat:

 chat/swift/Makefile |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 6f7b6e0c9bc4 -r c8dec40e91b5 chat/swift/Makefile
--- a/chat/swift/Makefile       Wed Oct 04 18:37:30 2017 +0000
+++ b/chat/swift/Makefile       Wed Oct 04 20:37:40 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2017/09/18 09:53:12 maya Exp $
+# $NetBSD: Makefile,v 1.30 2017/10/04 20:37:40 wiz Exp $
 
 DISTNAME=      swift-3.0
 PKGREVISION=   16
@@ -10,7 +10,9 @@
 COMMENT=       Swift XMPP Client
 LICENSE=       gnu-gpl-v3
 
-DEPENDS+=      scons>=1.3:../../devel/scons
+# would be nicer to build with pkgsrc version, but
+# swift-3.0 does not build with scons>=3
+#DEPENDS+=     scons>=1.3:../../devel/scons
 
 USE_LANGUAGES= c c++11
 USE_TOOLS+=    pkg-config
@@ -34,11 +36,11 @@
        ${ECHO} "allow_warnings=\"true\"" >> config.py ;
 
 do-build:
-       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons Swift
+       cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./scons Swift
 
 do-install:
        cd ${WRKSRC} && \
-       ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons \
+       ${SETENV} ${MAKE_ENV} ./scons \
            SWIFT_INSTALLDIR=${DESTDIR}/${PREFIX} ${DESTDIR}/${PREFIX}
        ${INSTALL_DATA} ${WRKSRC}/Swift/Packaging/Debian/debian/swift-im.1 \
                ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1



Home | Main Index | Thread Index | Old Index