pkgsrc-WIP-changes archive

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

qtcreator: pkglinkt package and try to fix linking



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Jun 15 09:26:59 2016 +0200
Changeset:	bf34f988c4903dbcd159fe16be06e1ffeeaecd30

Modified Files:
	qtcreator/Makefile

Log Message:
qtcreator: pkglinkt package and try to fix linking

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=bf34f988c4903dbcd159fe16be06e1ffeeaecd30

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

diffstat:
 qtcreator/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diffs:
diff --git a/qtcreator/Makefile b/qtcreator/Makefile
index 8baf0b0..ecef716 100644
--- a/qtcreator/Makefile
+++ b/qtcreator/Makefile
@@ -7,13 +7,13 @@ MASTER_SITES=	http://download.qt.io/official_releases/${PKGBASE}/${PKGVERSION_NO
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://www.qt.io
+HOMEPAGE=	http://www.qt.io/
 COMMENT=	Cross-platform IDE for Qt and C++
 LICENSE=	gnu-lgpl-v3
 
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
-USE_TOOLS=	bash perl
+USE_TOOLS+=	bash perl
 
 REPLACE_BASH+=	doc/api/examples/aggregation/test.sh
 REPLACE_BASH+=	share/qtcreator/scripts/openTerminal.command
@@ -57,9 +57,13 @@ REPLACE_PERL+=	scripts/updateCopyright.pl
 INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}/${PREFIX}
 INSTALL_TARGET=		install install_inst_qch_docs
 
+LDFLAGS+=	${COMPILER_RPATH_FLAG}${QTDIR}/lib
+LDFLAGS+=	${COMPILER_RPATH_FLAG}${X11BASE}/lib
+
 do-configure:
-	${RUN} cd ${WRKSRC} && ${PKGSRC_ENV} ${CONFIGURE_ENV} ${QTDIR}/bin/qmake -o Makefile
+	${RUN} cd ${WRKSRC} && ${PKGSRC_ENV} ${CONFIGURE_ENV} ${QTDIR}/bin/qmake QMAKE_LFLAGS=${LDFLAGS:Q} -o Makefile
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../x11/qt5-qtsvg/buildlink3.mk"
 .include "../../x11/qt5-qtscript/buildlink3.mk"


Home | Main Index | Thread Index | Old Index