diff options
author | Ralf Nolden <nolden@kde.org> | 2016-06-09 11:33:51 +0200 |
---|---|---|
committer | Ralf Nolden <nolden@kde.org> | 2016-06-11 20:17:38 +0000 |
commit | 927f26c3512bbf5e17701eba6fd1de5bc7c0effa (patch) | |
tree | cc799193bde3cdc379b901a087f59cf44a917156 /mkspecs/freebsd-g++ | |
parent | b465fe759695bb7e1de693c3d4d20acfd2c49779 (diff) | |
download | qtbase-927f26c3512bbf5e17701eba6fd1de5bc7c0effa.tar.gz |
BSD mkspec cleanup for FreeBSD, NetBSD and OpenBSD to common namespace
BSD OS mkspecs share mainly the same configurations except very few
differences. Merge into a common/bsd/bsd.conf file to be used across all BSD
OSes in their respective qmake.conf and add a qplatformdefs.h that contain
the common defines to be re-used in the BSD mkspecs.
The change includes the usage of <sys/param.h> also on NetBSD through the
common qplatformdefs.h, which is intended for using NetBSD's version defines.
Change-Id: Ibb0ac9e4c8bb5aff7d0febdcab1a4b9600a61117
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'mkspecs/freebsd-g++')
-rw-r--r-- | mkspecs/freebsd-g++/qmake.conf | 24 | ||||
-rw-r--r-- | mkspecs/freebsd-g++/qplatformdefs.h | 7 |
2 files changed, 9 insertions, 22 deletions
diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf index 56529389f6..1f4448889e 100644 --- a/mkspecs/freebsd-g++/qmake.conf +++ b/mkspecs/freebsd-g++/qmake.conf @@ -3,32 +3,14 @@ # MAKEFILE_GENERATOR = UNIX -QMAKE_PLATFORM = freebsd bsd +QMAKE_PLATFORM = freebsd -include(../common/unix.conf) +include(../common/bsd/bsd.conf) -QMAKE_CFLAGS_THREAD = -pthread - -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD - -# Addon software goes into /usr/local on the BSDs, by default we will look there +# Addon software goes into /usr/local on FreeBSD, 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) diff --git a/mkspecs/freebsd-g++/qplatformdefs.h b/mkspecs/freebsd-g++/qplatformdefs.h index aa51e08990..f70b9c0fa3 100644 --- a/mkspecs/freebsd-g++/qplatformdefs.h +++ b/mkspecs/freebsd-g++/qplatformdefs.h @@ -31,4 +31,9 @@ ** ****************************************************************************/ -#include "../freebsd-clang/qplatformdefs.h" +#ifndef QPLATFORMDEFS_H +#define QPLATFORMDEFS_H + +#include "../common/bsd/qplatformdefs.h" + +#endif // QPLATFORMDEFS_H |