diff options
| author | Dima Panov <fluffy@FreeBSD.org> | 2012-06-12 07:01:36 +0000 |
|---|---|---|
| committer | Dima Panov <fluffy@FreeBSD.org> | 2012-06-12 07:01:36 +0000 |
| commit | 6e0628a5ddf89b5127d5190f81d3b652bffe6602 (patch) | |
| tree | 535760f4fdcede575f2a9cda5c7ff550b721d418 | |
| parent | 954c1faffa55fcd3510c0a9967b8ac3001df353f (diff) | |
Notes
| -rw-r--r-- | devel/qmake4/Makefile | 3 | ||||
| -rw-r--r-- | devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff | 19 |
2 files changed, 22 insertions, 0 deletions
diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile index af6179986847..414aab8b8fde 100644 --- a/devel/qmake4/Makefile +++ b/devel/qmake4/Makefile @@ -6,6 +6,7 @@ # $FreeBSD$ PORTNAME= qmake +PORTREVISION= 1 DISTVERSION= ${QT4_VERSION} CATEGORIES= devel PKGNAMEPREFIX= qt4- @@ -60,6 +61,8 @@ post-patch: @${CP} -PpR ${WRKSRC}/../mkspecs/freebsd-g++46 ${WRKSRC}/../mkspecs/freebsd-clang @${REINPLACE_CMD} -e 's|g++-unix.conf|clang.conf|g' \ -e 's|freebsd-g++|freebsd-clang|g' \ + -e 's|gcc46|clang|g' \ + -e 's|g++46|clang++|g' \ ${WRKSRC}/../mkspecs/freebsd-clang/qmake.conf # Add mkspecs for the different GCC versions in the ports tree diff --git a/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff b/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff index f1778eb13706..4191450164c3 100644 --- a/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff +++ b/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff @@ -24,3 +24,22 @@ QMAKE_INCDIR_X11 = /usr/X11R6/include QMAKE_LIBDIR_X11 = /usr/X11R6/lib QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] +--- ../mkspecs/common/g++-base.conf.old 2012-04-27 06:45:52.000000000 +1100 ++++ ../mkspecs/common/g++-base.conf 2012-06-07 22:39:16.000000000 +1100 +@@ -8,14 +8,14 @@ + # you can use the manual test in tests/manual/mkspecs. + # + +-QMAKE_CC = gcc ++QMAKE_CC ?= gcc + + QMAKE_LINK_C = $$QMAKE_CC + QMAKE_LINK_C_SHLIB = $$QMAKE_CC + + QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g + +-QMAKE_CXX = g++ ++QMAKE_CXX ?= g++ + + QMAKE_LINK = $$QMAKE_CXX + QMAKE_LINK_SHLIB = $$QMAKE_CXX |