pkgsrc-WIP-changes archive

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

qtcreator: Revert previous



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Jun 15 11:05:40 2016 +0200
Changeset:	7af5c01dda7eaa42c87a9deaaa2b497871598978

Modified Files:
	qtcreator/Makefile
	qtcreator/distinfo

Log Message:
qtcreator: Revert previous

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

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

diffstat:
 qtcreator/Makefile | 7 +++----
 qtcreator/distinfo | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diffs:
diff --git a/qtcreator/Makefile b/qtcreator/Makefile
index 311f776..ecef716 100644
--- a/qtcreator/Makefile
+++ b/qtcreator/Makefile
@@ -57,12 +57,11 @@ 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
+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
+	${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"
diff --git a/qtcreator/distinfo b/qtcreator/distinfo
index 63fa9e4..94361b3 100644
--- a/qtcreator/distinfo
+++ b/qtcreator/distinfo
@@ -4,6 +4,5 @@ SHA1 (qt-creator-opensource-src-4.0.1.zip) = 2ab795222850cf9735661c02ac7ee27abcb
 RMD160 (qt-creator-opensource-src-4.0.1.zip) = 636d52578f0a7c9f5b32de1e78dfc09fe8a5c400
 SHA512 (qt-creator-opensource-src-4.0.1.zip) = 8685641b225186c121d1ad0e77817a0dd1c018240e9bfd095f66650eadd007711c291e79c01f2d307b65e2dd95a2408c72dd943a2484669d42da006a169b4045
 Size (qt-creator-opensource-src-4.0.1.zip) = 30243285 bytes
-SHA1 (patch-qtcreator.pro) = 1961dcaa116d8d1681fda221ed3fb96d04d07359
 SHA1 (patch-src_plugins_projectexplorer_abi.cpp) = 61f416b01fad576ed880bfbcc98647177462e3b6
 SHA1 (patch-src_shared_qbs_src_lib_corelib_tools_processutils.cpp) = 9a500ceedaf04b697dc8b709ba14bbd890c70923


Home | Main Index | Thread Index | Old Index