diff options
| author | tijl <tijl@FreeBSD.org> | 2014-03-24 03:58:33 +0800 |
|---|---|---|
| committer | tijl <tijl@FreeBSD.org> | 2014-03-24 03:58:33 +0800 |
| commit | 8eb27a80d3f34d29a595ace3441e4e9711fc186e (patch) | |
| tree | ec8e9be0450825ad20477f4b80c848e5b940543f /Mk | |
| parent | 0d88ad97c8f9fdce06e52d2b9080635e178f4ac2 (diff) | |
| download | freebsd-ports-gnome-8eb27a80d3f34d29a595ace3441e4e9711fc186e.tar.gz freebsd-ports-gnome-8eb27a80d3f34d29a595ace3441e4e9711fc186e.tar.zst freebsd-ports-gnome-8eb27a80d3f34d29a595ace3441e4e9711fc186e.zip | |
- Make Qt4 and Qt5 respect CXXFLAGS during configure so they pick up
-DLIBICONV_PLUG from USES=iconv and always use libc iconv when it is
available.
- Remove the iconv dependency from Qt5. It uses icu instead.
PR: ports/186707
Approved by: kde (makc)
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.qt.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index f13bb508ee88..23b96e47c406 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -166,7 +166,8 @@ CONFIGURE_ARGS+=-verbose . endif . if ${QT_DIST} == "base" || ${_QT_VERSION:M4*} -EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure +EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \ + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test . if ${_QT_VERSION:M5*} EXTRA_PATCHES+= ${.CURDIR:H:H}/devel/qt5-core/files/extrapatch-src__corelib__tools__qdatetime.cpp . endif |