pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/qt5-qttools qt5-qttools: make qdoc optional
details: https://anonhg.NetBSD.org/pkgsrc/rev/83b061968163
branches: trunk
changeset: 390827:83b061968163
user: tnn <tnn%pkgsrc.org@localhost>
date: Sat Jan 26 23:20:41 2019 +0000
description:
qt5-qttools: make qdoc optional
It pulls in all of clang and I don't need that just to build wireshark.
diffstat:
x11/qt5-qttools/Makefile | 14 +++++++++++---
x11/qt5-qttools/PLIST | 4 ++--
2 files changed, 13 insertions(+), 5 deletions(-)
diffs (59 lines):
diff -r a495d9edb4e4 -r 83b061968163 x11/qt5-qttools/Makefile
--- a/x11/qt5-qttools/Makefile Sat Jan 26 23:20:36 2019 +0000
+++ b/x11/qt5-qttools/Makefile Sat Jan 26 23:20:41 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2018/12/18 09:57:19 adam Exp $
+# $NetBSD: Makefile,v 1.49 2019/01/26 23:20:41 tnn Exp $
DISTNAME= qttools-everywhere-src-${QTVERSION}
PKGNAME= qt5-qttools-${QTVERSION}
@@ -6,13 +6,22 @@
DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
-MAKE_ENV+= LLVM_INSTALL_DIR=${BUILDLINK_PREFIX.clang}
MAKE_ENV+= QTDIR=${QTDIR}
INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
INSTALLATION_DIRS+= lib/pkgconfig
+PKG_SUPPORTED_OPTIONS+= llvm
+PKG_SUGGESTED_OPTIONS+= llvm
+PLIST_VARS+= llvm
+
.include "../../x11/qt5-qtbase/Makefile.common"
+.if !empty(PKG_OPTIONS:Mllvm)
+PLIST.llvm= yes
+MAKE_ENV+= LLVM_INSTALL_DIR=${BUILDLINK_PREFIX.clang}
+.include "../../lang/clang/buildlink3.mk"
+.endif
+
QTPKGCONFIGPC= Qt5Designer.pc Qt5Help.pc Qt5UiTools.pc
post-install:
@@ -21,7 +30,6 @@
ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
.endfor
-.include "../../lang/clang/buildlink3.mk"
.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
.include "../../x11/qt5-qtlocation/buildlink3.mk"
.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
diff -r a495d9edb4e4 -r 83b061968163 x11/qt5-qttools/PLIST
--- a/x11/qt5-qttools/PLIST Sat Jan 26 23:20:36 2019 +0000
+++ b/x11/qt5-qttools/PLIST Sat Jan 26 23:20:41 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2018/12/18 09:57:19 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2019/01/26 23:20:41 tnn Exp $
lib/pkgconfig/Qt5Designer.pc
lib/pkgconfig/Qt5Help.pc
lib/pkgconfig/Qt5UiTools.pc
@@ -17,7 +17,7 @@
qt5/bin/qdbus
qt5/bin/qdbusviewer
qt5/bin/qdistancefieldgenerator
-qt5/bin/qdoc
+${PLIST.llvm}qt5/bin/qdoc
qt5/bin/qhelpgenerator
qt5/bin/qtattributionsscanner
qt5/bin/qtdiag
Home |
Main Index |
Thread Index |
Old Index