summaryrefslogtreecommitdiffstats
path: root/mkspecs/freebsd-g++
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2016-01-29 11:20:50 -0800
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2016-02-02 19:23:53 +0000
commit628d3b7d3a5646d4d1503c1c0fdef0e51bc5129b (patch)
tree1acabc4a8aea6bea5630e1f234ae4a880f06d953 /mkspecs/freebsd-g++
parentccf74b592809e0c5a613eff27d6431a4c659e368 (diff)
Swap the GCC and Clang versions of supported FreeBSD mkspecs
Modern FreeBSD doesn't come with GCC by default anymore and doesn't even provide the "gcc" or "g++" falback that OS X does. So there's no point in keeping the freebsd-clang mkspec in unsupported/ since it's the only one that works, or keeping the freebsd-g++* ones outside, as they won't compile. I'm not removing the GCC mkspecs because you can still install GCC from the ports tree. [ChangeLog][FreeBSD] The "freebsd-clang" mkspec is no longer in the unsupported/ subdir. If you have scripts you use to build Qt, you'll need to update them to say -platform freebsd-clang or remove the -platform argument. Change-Id: I7a9e11d7b64a4cc78e24ffff142dfc11d3aabb1e Reviewed-by: Raphael Kubo da Costa <rakuco@FreeBSD.org> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'mkspecs/freebsd-g++')
-rw-r--r--mkspecs/freebsd-g++/qmake.conf34
-rw-r--r--mkspecs/freebsd-g++/qplatformdefs.h80
2 files changed, 0 insertions, 114 deletions
diff --git a/mkspecs/freebsd-g++/qmake.conf b/mkspecs/freebsd-g++/qmake.conf
deleted file mode 100644
index 282b6bdfa7..0000000000
--- a/mkspecs/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)
diff --git a/mkspecs/freebsd-g++/qplatformdefs.h b/mkspecs/freebsd-g++/qplatformdefs.h
deleted file mode 100644
index 3a39b79c41..0000000000
--- a/mkspecs/freebsd-g++/qplatformdefs.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the qmake spec of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#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/param.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
-
-#endif // QPLATFORMDEFS_H