[kde-freebsd] [patch] fix devel/qmake4 creating bogus qmake.conf
Mel Flynn
mel.flynn+fbsd.kde at mailing.thruhere.net
Thu Aug 20 19:11:30 CEST 2009
Hi,
devel/qmake4 creates faulty qmake.conf if $CXX is set to anything other then
the "c++" string. Even if it's set to /usr/bin/c++.
Attached patch fixes the issue, by only replacing with $CXX if the last char
on the line is not a ')'. This has the advantage that a second replace on
qmake.conf is not necessary.
--
Mel
-------------- next part --------------
Index: devel/qmake4/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/qmake4/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- devel/qmake4/Makefile 4 Aug 2009 22:02:10 -0000 1.17
+++ devel/qmake4/Makefile 20 Aug 2009 16:55:55 -0000
@@ -43,8 +43,8 @@
post-patch:
@${REINPLACE_CMD} -e 's|-O2|${CXXFLAGS}|' \
- -e 's|gcc.*|${CC}|' \
- -e 's|g++.*|${CXX}|' \
+ -e 's|gcc.*[^)]$$|${CC}|' \
+ -e 's|g++.*[^)]$$|${CXX}|' \
-e 's|/usr/local|${LOCALBASE}|' \
-e 's|/usr/X11R6|${LOCALBASE}|' \
-e 's|release|release thread|' \
@@ -56,8 +56,6 @@
${WRKSRC}/../mkspecs/freebsd-g++34/qmake.conf \
${WRKSRC}/../mkspecs/freebsd-g++40/qmake.conf \
${WRKSRC}/../mkspecs/freebsd-icc/qmake.conf
- @${REINPLACE_CMD} -e 's|include(../common/c++|include(../common/g++.conf)|' \
- ${WRKSRC}/../mkspecs/freebsd-g++/qmake.conf
@${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix
do-configure:
More information about the kde-freebsd
mailing list