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/netbsd-g++ | |
| parent | b465fe759695bb7e1de693c3d4d20acfd2c49779 (diff) | |
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/netbsd-g++')
| -rw-r--r-- | mkspecs/netbsd-g++/qmake.conf | 29 | ||||
| -rw-r--r-- | mkspecs/netbsd-g++/qplatformdefs.h | 41 |
2 files changed, 8 insertions, 62 deletions
diff --git a/mkspecs/netbsd-g++/qmake.conf b/mkspecs/netbsd-g++/qmake.conf index ddd82326af..31005d9134 100644 --- a/mkspecs/netbsd-g++/qmake.conf +++ b/mkspecs/netbsd-g++/qmake.conf @@ -3,35 +3,20 @@ # MAKEFILE_GENERATOR = UNIX -QMAKE_PLATFORM = netbsd bsd +QMAKE_PLATFORM = netbsd -include(../common/unix.conf) -include(../common/gcc-base-unix.conf) -include(../common/g++-unix.conf) - -QMAKE_CFLAGS_THREAD = -pthread - -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD +include(../common/bsd/bsd.conf) +# Addon software goes into /usr/pkg on NetBSD, by default we will look there QMAKE_INCDIR = /usr/pkg/include QMAKE_LIBDIR = /usr/pkg/lib + +# System provided X11 defaults to X11R7 path on NetBSD since 5.0 QMAKE_INCDIR_X11 = /usr/X11R7/include QMAKE_LIBDIR_X11 = /usr/X11R7/lib QMAKE_INCDIR_OPENGL = /usr/X11R7/include QMAKE_LIBDIR_OPENGL = /usr/X11R7/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/netbsd-g++/qplatformdefs.h b/mkspecs/netbsd-g++/qplatformdefs.h index bcba448e2c..f70b9c0fa3 100644 --- a/mkspecs/netbsd-g++/qplatformdefs.h +++ b/mkspecs/netbsd-g++/qplatformdefs.h @@ -34,45 +34,6 @@ #ifndef QPLATFORMDEFS_H #define QPLATFORMDEFS_H -// Get Qt defines/settings - -#include "qglobal.h" - -// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs - -#include <unistd.h> - - -// We are hot - unistd.h should have turned on the specific APIs we requested - - -#include <pthread.h> -#include <dirent.h> -#include <fcntl.h> -#include <grp.h> -#include <pwd.h> -#include <signal.h> -#include <dlfcn.h> - -#include <sys/types.h> -#include <sys/ioctl.h> -#include <sys/ipc.h> -#include <sys/time.h> -#include <sys/shm.h> -#include <sys/socket.h> -#include <sys/stat.h> -#include <sys/wait.h> -#include <netinet/in.h> -#ifndef QT_NO_IPV6IFNAME -#include <net/if.h> -#endif - -#include "../common/posix/qplatformdefs.h" - -#undef QT_OPEN_LARGEFILE -#define QT_OPEN_LARGEFILE 0 - -#define QT_SNPRINTF ::snprintf -#define QT_VSNPRINTF ::vsnprintf +#include "../common/bsd/qplatformdefs.h" #endif // QPLATFORMDEFS_H |