From 2dc54c10bba6d641b4d46c918867cc9f735e5b1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Larcher?= <aurelien.larcher@gmail.com>
Date: Tue, 13 Sep 2016 20:26:45 +0200
Subject: [PATCH] Rework mkspecs

Change-Id: I6edfb62dd124cfb94d26b27d492913d964136e4c
---
 mkspecs/solaris-g++-64/qmake.conf | 123 +++++++++++++++++---------------------
 mkspecs/solaris-g++/qmake.conf    | 106 ++++++++++++++++----------------
 2 files changed, 112 insertions(+), 117 deletions(-)

diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf
index 91ffb91..4e926b7 100644
--- a/qtbase/mkspecs/solaris-g++-64/qmake.conf
+++ b/qtbase/mkspecs/solaris-g++-64/qmake.conf
@@ -94,4 +51,36 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
+QMAKE_STRIP             = strip
+QMAKE_STRIPFLAGS_LIB    =
+
+#END   include(../common/solaris.conf)
+
+QMAKE_CFLAGS            = -m64 -fPIC
+# -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
+QMAKE_LFLAGS            = -m64
+
+#BEGIN include(../common/gcc-base-unix.conf)
+
+include(../common/gcc-base.conf)
+
+QMAKE_LFLAGS_SHLIB      = -shared
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME     = -h$$LITERAL_WHITESPACE
+QMAKE_LFLAGS_THREAD     =
+QMAKE_LFLAGS_NOUNDEF    = -z defs
+QMAKE_LFLAGS_RPATH      = -Wl,-R,
+
+#END include(../common/gcc-base-unix.conf)
+
+#BEGIN include(../common/g++-unix.conf)
+
+include(../common/g++-base.conf)
+
+QMAKE_LFLAGS_RELEASE   +=
+QMAKE_LFLAGS_DEBUG      = -g
+QMAKE_LFLAGS_NOUNDEF   += -Wl,-z,defs
+
+#END   include(../common/g++-unix.conf)
+
 load(qt_config)
diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf
index 5946463..2e25f5f 100644
--- a/qtbase/mkspecs/solaris-g++/qmake.conf
+++ b/qtbase/mkspecs/solaris-g++/qmake.conf
@@ -77,4 +51,36 @@ QMAKE_OBJCOPY           = objcopy
 QMAKE_NM                = nm -P
 QMAKE_RANLIB            =
 
+QMAKE_STRIP             = strip
+QMAKE_STRIPFLAGS_LIB    = 
+
+#END   include(../common/solaris.conf)
+
+QMAKE_CFLAGS            = -m32 -fPIC
+# -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
+QMAKE_LFLAGS            = -m32
+
+#BEGIN include(../common/gcc-base-unix.conf)
+
+include(../common/gcc-base.conf)
+
+QMAKE_LFLAGS_SHLIB      = -shared
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME     = -h$$LITERAL_WHITESPACE
+QMAKE_LFLAGS_THREAD     =
+QMAKE_LFLAGS_NOUNDEF    = -z defs
+QMAKE_LFLAGS_RPATH      = -Wl,-R,
+
+#END include(../common/gcc-base-unix.conf)
+
+#BEGIN include(../common/g++-unix.conf)
+
+include(../common/g++-base.conf)
+
+QMAKE_LFLAGS_RELEASE   +=
+QMAKE_LFLAGS_DEBUG      = -g
+QMAKE_LFLAGS_NOUNDEF   += -Wl,-z,defs
+
+#END   include(../common/g++-unix.conf)
+
 load(qt_config)
-- 
2.9.2