diff options
| author | Alan Eldridge <alane@FreeBSD.org> | 2002-08-30 13:52:25 +0000 |
|---|---|---|
| committer | Alan Eldridge <alane@FreeBSD.org> | 2002-08-30 13:52:25 +0000 |
| commit | ab02fb8a66b147186d10558098387590232255e1 (patch) | |
| tree | e0167dfb071c69dd53979a620270f83bea5326b4 | |
| parent | Deploy USE_GNOMENG infrastructure (diff) | |
Added "threads" to the qmake.conf file. From this message on the list:
FreeBSD port installs threaded version of qt (qt-mt), but qmake.conf is
installed withouth thread in the CONFIG variable. Because of that, qmake tried
to link with -lqt instead of -lqt-mt -pthread and fails. With thread in the
CONFIG everything works. This affects all ports that use qmake.
Folks, please test this (especially on current). It seems reasonable, is easy
to back out, I'm running a qt built with it right now.
Submitted by: Tilman Linneweh <tilman@arved.de>
| -rw-r--r-- | x11-toolkits/qt30/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/qt31/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/qt32/Makefile | 2 | ||||
| -rw-r--r-- | x11-toolkits/qt33/Makefile | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile index cd939272c586..550ae714e8da 100644 --- a/x11-toolkits/qt30/Makefile +++ b/x11-toolkits/qt30/Makefile @@ -105,6 +105,8 @@ post-patch: ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf @${REINPLACE_CMD} -e 's,g++,${CXX},' \ ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,release,release thread,' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf # Work around qmake generated dependencies pre-install: diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile index cd939272c586..550ae714e8da 100644 --- a/x11-toolkits/qt31/Makefile +++ b/x11-toolkits/qt31/Makefile @@ -105,6 +105,8 @@ post-patch: ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf @${REINPLACE_CMD} -e 's,g++,${CXX},' \ ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,release,release thread,' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf # Work around qmake generated dependencies pre-install: diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile index cd939272c586..550ae714e8da 100644 --- a/x11-toolkits/qt32/Makefile +++ b/x11-toolkits/qt32/Makefile @@ -105,6 +105,8 @@ post-patch: ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf @${REINPLACE_CMD} -e 's,g++,${CXX},' \ ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,release,release thread,' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf # Work around qmake generated dependencies pre-install: diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index cd939272c586..550ae714e8da 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -105,6 +105,8 @@ post-patch: ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf @${REINPLACE_CMD} -e 's,g++,${CXX},' \ ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + @${REINPLACE_CMD} -e 's,release,release thread,' \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf # Work around qmake generated dependencies pre-install: |