components/library/qt5/patches/qtbase-0001-Rework-mkspecs.patch

   1 From 2dc54c10bba6d641b4d46c918867cc9f735e5b1b Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Aur=C3=A9lien=20Larcher?= <aurelien.larcher@gmail.com>
   3 Date: Tue, 13 Sep 2016 20:26:45 +0200
   4 Subject: [PATCH] Rework mkspecs
   5
   6 Change-Id: I6edfb62dd124cfb94d26b27d492913d964136e4c
   7 ---
   8  mkspecs/solaris-g++-64/qmake.conf | 123 +++++++++++++++++---------------------
   9  mkspecs/solaris-g++/qmake.conf    | 106 ++++++++++++++++----------------
  10  2 files changed, 112 insertions(+), 117 deletions(-)
  11
  12 diff --git a/mkspecs/solaris-g++-64/qmake.conf b/mkspecs/solaris-g++-64/qmake.conf
  13 index 91ffb91..4e926b7 100644
  14 --- a/qtbase/mkspecs/solaris-g++-64/qmake.conf
  15 +++ b/qtbase/mkspecs/solaris-g++-64/qmake.conf
  16 @@ -94,4 +51,36 @@ QMAKE_OBJCOPY           = objcopy
  17  QMAKE_NM                = nm -P
  18  QMAKE_RANLIB            =
  19
  20 +QMAKE_STRIP             = strip
  21 +QMAKE_STRIPFLAGS_LIB    =
  22 +
  23 +#END   include(../common/solaris.conf)
  24 +
  25 +QMAKE_CFLAGS            = -m64 -fPIC
  26 +# -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
  27 +QMAKE_LFLAGS            = -m64
  28 +
  29 +#BEGIN include(../common/gcc-base-unix.conf)
  30 +
  31 +include(../common/gcc-base.conf)
  32 +
  33 +QMAKE_LFLAGS_SHLIB      = -shared
  34 +QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
  35 +QMAKE_LFLAGS_SONAME     = -h$$LITERAL_WHITESPACE
  36 +QMAKE_LFLAGS_THREAD     =
  37 +QMAKE_LFLAGS_NOUNDEF    = -z defs
  38 +QMAKE_LFLAGS_RPATH      = -Wl,-R,
  39 +
  40 +#END include(../common/gcc-base-unix.conf)
  41 +
  42 +#BEGIN include(../common/g++-unix.conf)
  43 +
  44 +include(../common/g++-base.conf)
  45 +
  46 +QMAKE_LFLAGS_RELEASE   +=
  47 +QMAKE_LFLAGS_DEBUG      = -g
  48 +QMAKE_LFLAGS_NOUNDEF   += -Wl,-z,defs
  49 +
  50 +#END   include(../common/g++-unix.conf)
  51 +
  52  load(qt_config)
  53 diff --git a/mkspecs/solaris-g++/qmake.conf b/mkspecs/solaris-g++/qmake.conf
  54 index 5946463..2e25f5f 100644
  55 --- a/qtbase/mkspecs/solaris-g++/qmake.conf
  56 +++ b/qtbase/mkspecs/solaris-g++/qmake.conf
  57 @@ -77,4 +51,36 @@ QMAKE_OBJCOPY           = objcopy
  58  QMAKE_NM                = nm -P
  59  QMAKE_RANLIB            =
  60
  61 +QMAKE_STRIP             = strip
  62 +QMAKE_STRIPFLAGS_LIB    =
  63 +
  64 +#END   include(../common/solaris.conf)
  65 +
  66 +QMAKE_CFLAGS            = -m32 -fPIC
  67 +# -D_XOPEN_SOURCE=600 -D__EXTENSIONS__
  68 +QMAKE_LFLAGS            = -m32
  69 +
  70 +#BEGIN include(../common/gcc-base-unix.conf)
  71 +
  72 +include(../common/gcc-base.conf)
  73 +
  74 +QMAKE_LFLAGS_SHLIB      = -shared
  75 +QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
  76 +QMAKE_LFLAGS_SONAME     = -h$$LITERAL_WHITESPACE
  77 +QMAKE_LFLAGS_THREAD     =
  78 +QMAKE_LFLAGS_NOUNDEF    = -z defs
  79 +QMAKE_LFLAGS_RPATH      = -Wl,-R,
  80 +
  81 +#END include(../common/gcc-base-unix.conf)
  82 +
  83 +#BEGIN include(../common/g++-unix.conf)
  84 +
  85 +include(../common/g++-base.conf)
  86 +
  87 +QMAKE_LFLAGS_RELEASE   +=
  88 +QMAKE_LFLAGS_DEBUG      = -g
  89 +QMAKE_LFLAGS_NOUNDEF   += -Wl,-z,defs
  90 +
  91 +#END   include(../common/g++-unix.conf)
  92 +
  93  load(qt_config)
  94 --
  95 2.9.2
  96