summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-08-22 09:08:39 +0000
committerwiz <wiz@pkgsrc.org>2014-08-22 09:08:39 +0000
commit940ccc96977664901f26c132a262f036728fb8c2 (patch)
treea60591a20d0f4394872583e97ea93b8f6ad5aa5b /x11
parentb439c7902034cd505fbaeaeab45a21b5d3a0529d (diff)
downloadpkgsrc-940ccc96977664901f26c132a262f036728fb8c2.tar.gz
Fix linkage. For some reason, Qsci.so was not linked against
libqscintilla2, make it unusable by itself. Hardcode libqscintilla2 into LDFLAGS. Bump PKGREVISION.
Diffstat (limited to 'x11')
-rw-r--r--x11/py-qt4-qscintilla/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/x11/py-qt4-qscintilla/Makefile b/x11/py-qt4-qscintilla/Makefile
index 40b7b649567..036591cfc41 100644
--- a/x11/py-qt4-qscintilla/Makefile
+++ b/x11/py-qt4-qscintilla/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2014/08/21 21:35:39 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2014/08/22 09:08:39 wiz Exp $
.include "../../x11/qt4-qscintilla/Makefile.common"
PKGNAME= ${PYPKGPREFIX}-qt4-${DISTNAME:tl:S/-gpl-/-/}
+PKGREVISION= 1
COMMENT= QScintilla -- Python bindings
WRKSRC= ${WRKDIR}/${DISTNAME}/Python
@@ -12,12 +13,15 @@ PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
MAKE_FLAGS+= TARGET=Qsci.la TARGETD=Qsci.la TARGETL=Qsci.la
INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR}
+LIBS+= -lqscintilla2
+MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q}\ ${LIBS:Q}
do-configure:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} configure.py \
--qmake=${QTDIR}/bin/qmake --sip=${PREFIX}/bin/sip${PYVERSSUFFIX} \
--pyqt-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX} \
- --qsci-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX}
+ --qsci-sipdir=${PREFIX}/share/sip${PYVERSSUFFIX} \
+ --qsci-libdir=${QTDIR}/lib
post-install:
${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/Qsci.la \