I am building the new QT and (eventually) KDE from area51. I am using clang to
compile everything.
I ran into a build problem which stems from qmake. The qmake port itself builds
fine, but the next thing to be built with qmake fails. The culprit is some bad
mkspec files. The g++.conf file which was being copied to clang.conf has been
refactored into a couple files so our handling of it needs to be refactored.
Here is a patch which seems to work fine so far:
Index: QT/devel/qmake4/pkg-plist
===================================================================
--- QT/devel/qmake4/pkg-plist (revision 8115)
+++ QT/devel/qmake4/pkg-plist (working copy)
@@ -10,7 +10,8 @@
share/qt4/mkspecs/common/aix/qplatformdefs.h
share/qt4/mkspecs/common/armcc.conf
share/qt4/mkspecs/common/c89/qplatformdefs.h
-share/qt4/mkspecs/common/clang.conf
+share/qt4/mkspecs/common/clang-base.conf
+share/qt4/mkspecs/common/clang-unix.conf
share/qt4/mkspecs/common/g++-base.conf
share/qt4/mkspecs/common/g++-macx.conf
share/qt4/mkspecs/common/g++-unix.conf
Index: QT/devel/qmake4/Makefile
===================================================================
--- QT/devel/qmake4/Makefile (revision 8115)
+++ QT/devel/qmake4/Makefile (working copy)
@@ -52,9 +52,10 @@
${WRKSRC}/../mkspecs/freebsd-*/qmake.conf
@${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix
# Add mkspecs for all the available compilers.
- @${CP} ${WRKSRC}/../mkspecs/common/g++.conf
${WRKSRC}/../mkspecs/common/clang.conf
- @${REINPLACE_CMD} -e 's|gcc|clang|g' -e 's|g++|clang++|g' \
- ${WRKSRC}/../mkspecs/common/clang.conf
+ @${CP} ${WRKSRC}/../mkspecs/common/g++-base.conf
${WRKSRC}/../mkspecs/common/clang-base.conf
+ @${CP} ${WRKSRC}/../mkspecs/common/g++-unix.conf
${WRKSRC}/../mkspecs/common/clang-unix.conf
+ @${REINPLACE_CMD} -e 's|gcc|clang|g' -e 's|g++|clang++|g'
${WRKSRC}/../mkspecs/common/clang-base.conf
+ @${REINPLACE_CMD} -e 's|gcc|clang|g' -e 's|g++|clang|g'
${WRKSRC}/../mkspecs/common/clang-unix.conf
# FIXME: This is ugly
@${RM} ${WRKSRC}/../mkspecs/freebsd-g++/*.orig
_______________________________________________
kde-freebsd mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information
