From e28d31dbfaca7f870240fe414ccfedceb16731d7 Mon Sep 17 00:00:00 2001 From: Ralf Nolden Date: Fri, 20 May 2016 21:50:36 +0200 Subject: Move freebsd-g++ mkspecs back for supported FreeBSD 9.3 and up FreeBSD 9.3 is still supported and uses gcc as the default compiler, therefore FreeBSD ports require patching the mkspecs back. To avoid patching, move the mkspecs back to the right place and adapt the path in the qmake.conf/qplatformdefs.h [ChangeLog][FreeBSD] The freebsd-g++ mkspec was moved back and no longer requires the "unsupported/" prefix, matching the FreeBSD ports tree, as FreeBSD 9.3 still defaults to using GCC. Users of GCC that did not previously use the ports patch will need to adapt their build scripts and drop the "unsupported/" prefix. Change-Id: Ideda4a33cccf5381000f6f50b6ae92a5c24ba9d4 Reviewed-by: Thiago Macieira --- mkspecs/unsupported/freebsd-g++/qmake.conf | 34 ------------------------------ 1 file changed, 34 deletions(-) delete mode 100644 mkspecs/unsupported/freebsd-g++/qmake.conf (limited to 'mkspecs/unsupported/freebsd-g++/qmake.conf') diff --git a/mkspecs/unsupported/freebsd-g++/qmake.conf b/mkspecs/unsupported/freebsd-g++/qmake.conf deleted file mode 100644 index 527a94870c..0000000000 --- a/mkspecs/unsupported/freebsd-g++/qmake.conf +++ /dev/null @@ -1,34 +0,0 @@ -# -# qmake configuration for freebsd-g++ -# - -MAKEFILE_GENERATOR = UNIX -QMAKE_PLATFORM = freebsd bsd - -include(../../common/unix.conf) - -QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE - -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -# Addon software goes into /usr/local on the BSDs, by default we will look there -QMAKE_INCDIR = /usr/local/include -QMAKE_LIBDIR = /usr/local/lib - -QMAKE_LFLAGS_THREAD = -pthread - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = -QMAKE_LIBS_EXECINFO = -lexecinfo -QMAKE_LIBS_X11 = -lXext -lX11 -lm -QMAKE_LIBS_OPENGL = -lGL -QMAKE_LIBS_THREAD = - -QMAKE_AR = ar cqs -QMAKE_OBJCOPY = objcopy -QMAKE_NM = nm -P -QMAKE_RANLIB = - -include(../../common/gcc-base-unix.conf) -include(../../common/g++-unix.conf) -load(qt_config) -- cgit v1.2.3