org.handhelds.familiar/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch

   1 Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/qws/linux-arm-g++/qmake.conf
   2 ===================================================================
   3 --- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/qws/linux-arm-g++/qmake.conf       2005-06-06 16:35:19.000000000 +0200
   4 +++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/qws/linux-arm-g++/qmake.conf    2005-06-15 21:26:15.000000000 +0200
   5 @@ -8,12 +8,12 @@
   6  QT                      += core gui network
   7  QMAKE_INCREMENTAL_STYLE = sublib
   8
   9 -QMAKE_CC               = arm-linux-gcc
  10 +QMAKE_CC               = $(CCACHE) arm-linux-gcc
  11  QMAKE_LEX              = flex
  12  QMAKE_LEXFLAGS         =
  13  QMAKE_YACC             = yacc
  14  QMAKE_YACCFLAGS                = -d
  15 -QMAKE_CFLAGS           = -pipe
  16 +QMAKE_CFLAGS           = -pipe $(EXTRA_CFLAGS)
  17  QMAKE_CFLAGS_WARN_ON   = -Wall -W
  18  QMAKE_CFLAGS_WARN_OFF  =
  19  QMAKE_CFLAGS_RELEASE   = -O2
  20 @@ -22,8 +22,8 @@
  21  QMAKE_CFLAGS_YACC      = -Wno-unused -Wno-parentheses
  22  QMAKE_CFLAGS_THREAD    = -D_REENTRANT
  23
  24 -QMAKE_CXX              = arm-linux-g++
  25 -QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti
  26 +QMAKE_CXX              = $(CCACHE) arm-linux-g++
  27 +QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti $(EXTRA_CXXFLAGS)
  28  QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
  29  QMAKE_CXXFLAGS_WARN_OFF        = $$QMAKE_CFLAGS_WARN_OFF
  30  QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
  31 @@ -45,14 +45,14 @@
  32
  33  QMAKE_LINK             = arm-linux-g++
  34  QMAKE_LINK_SHLIB       = arm-linux-g++
  35 -QMAKE_LFLAGS           =
  36 +QMAKE_LFLAGS           = $(EXTRA_LFLAGS)
  37  QMAKE_LFLAGS_RELEASE   =
  38  QMAKE_LFLAGS_DEBUG     =
  39  QMAKE_LFLAGS_SHLIB      = -shared
  40  QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
  41  QMAKE_LFLAGS_SONAME     = -Wl,-soname,
  42  QMAKE_LFLAGS_THREAD     =
  43 -QMAKE_RPATH             = -Wl,-rpath,
  44 +QMAKE_RPATH             = -Wl,-rpath-link,
  45
  46  QMAKE_LIBS             =
  47  QMAKE_LIBS_DYNLOAD      = -ldl
  48 Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++/qmake.conf
  49 ===================================================================
  50 --- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++/qmake.conf     2005-06-06 16:34:59.000000000 +0200
  51 +++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++/qmake.conf  2005-06-15 21:41:52.000000000 +0200
  52 @@ -7,7 +7,7 @@
  53  CONFIG                 += qt warn_on release link_prl
  54  QT                     += core gui
  55
  56 -QMAKE_CC               = gcc
  57 +QMAKE_CC               = $(CCACHE) gcc
  58  QMAKE_LEX              = flex
  59  QMAKE_LEXFLAGS         =
  60  QMAKE_YACC             = yacc
  61 @@ -22,7 +22,7 @@
  62  QMAKE_CFLAGS_YACC      = -Wno-unused -Wno-parentheses
  63  QMAKE_CFLAGS_THREAD    = -pthread -D_THREAD_SAFE
  64
  65 -QMAKE_CXX              = g++
  66 +QMAKE_CXX              = $(CCACHE) g++
  67  QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS
  68  QMAKE_CXXFLAGS_DEPS    = $$QMAKE_CFLAGS_DEPS
  69  QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
  70 Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++34/qmake.conf
  71 ===================================================================
  72 --- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++34/qmake.conf   2005-06-06 16:34:59.000000000 +0200
  73 +++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++34/qmake.conf        2005-06-15 21:42:13.000000000 +0200
  74 @@ -7,7 +7,7 @@
  75  CONFIG                 += qt warn_on release link_prl
  76  QT                     += core gui
  77
  78 -QMAKE_CC               = gcc34
  79 +QMAKE_CC               = $(CCACHE) gcc34
  80  QMAKE_LEX              = flex
  81  QMAKE_LEXFLAGS         =
  82  QMAKE_YACC             = yacc
  83 @@ -22,7 +22,7 @@
  84  QMAKE_CFLAGS_YACC      = -Wno-unused -Wno-parentheses
  85  QMAKE_CFLAGS_THREAD    = -pthread -D_THREAD_SAFE
  86
  87 -QMAKE_CXX              = g++34
  88 +QMAKE_CXX              = $(CCACHE) g++34
  89  QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS
  90  QMAKE_CXXFLAGS_DEPS    = $$QMAKE_CFLAGS_DEPS
  91  QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
  92 Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++40/qmake.conf
  93 ===================================================================
  94 --- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++40/qmake.conf   2005-06-06 16:34:59.000000000 +0200
  95 +++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++40/qmake.conf        2005-06-15 21:42:44.000000000 +0200
  96 @@ -7,7 +7,7 @@
  97  CONFIG                 += qt warn_on release link_prl
  98  QT                     += core gui
  99
 100 -QMAKE_CC               = gcc40
 101 +QMAKE_CC               = $(CCACHE) gcc40
 102  QMAKE_LEX              = flex
 103  QMAKE_LEXFLAGS         =
 104  QMAKE_YACC             = yacc
 105 @@ -22,7 +22,7 @@
 106  QMAKE_CFLAGS_YACC      = -Wno-unused -Wno-parentheses
 107  QMAKE_CFLAGS_THREAD    = -pthread -D_THREAD_SAFE
 108
 109 -QMAKE_CXX              = g++40
 110 +QMAKE_CXX              = $(CCACHE) g++40
 111  QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS
 112  QMAKE_CXXFLAGS_DEPS    = $$QMAKE_CFLAGS_DEPS
 113  QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
 114 Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-32/qmake.conf
 115 ===================================================================
 116 --- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++-32/qmake.conf    2005-06-06 16:35:00.000000000 +0200
 117 +++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-32/qmake.conf 2005-06-15 21:40:50.000000000 +0200
 118 @@ -8,7 +8,7 @@
 119  QT                     += core gui
 120  QMAKE_INCREMENTAL_STYLE = sublib
 121
 122 -QMAKE_CC               = gcc
 123 +QMAKE_CC               = $(CCACHE) gcc
 124  QMAKE_LEX              = flex
 125  QMAKE_LEXFLAGS         =
 126  QMAKE_YACC             = yacc
 127 @@ -27,7 +27,7 @@
 128  QMAKE_CFLAGS_THREAD    = -D_REENTRANT
 129  QMAKE_CFLAGS_HIDESYMS   = -fvisibility=hidden
 130
 131 -QMAKE_CXX              = g++
 132 +QMAKE_CXX              = $(CCACHE) g++
 133  QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS
 134  QMAKE_CXXFLAGS_DEPS    = $$QMAKE_CFLAGS_DEPS
 135  QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
 136 Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-64/qmake.conf
 137 ===================================================================
 138 --- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++-64/qmake.conf    2005-06-06 16:35:00.000000000 +0200
 139 +++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-64/qmake.conf 2005-06-15 21:41:10.000000000 +0200
 140 @@ -11,7 +11,7 @@
 141  QT                     += core gui
 142  QMAKE_INCREMENTAL_STYLE = sublib
 143
 144 -QMAKE_CC               = gcc
 145 +QMAKE_CC               = $(CCACHE) gcc
 146  QMAKE_LEX              = flex
 147  QMAKE_LEXFLAGS         =
 148  QMAKE_YACC             = yacc
 149 @@ -26,7 +26,7 @@
 150  QMAKE_CFLAGS_YACC      = -Wno-unused -Wno-parentheses
 151  QMAKE_CFLAGS_THREAD    = -D_REENTRANT
 152
 153 -QMAKE_CXX              = g++
 154 +QMAKE_CXX              = $(CCACHE) g++
 155  QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS
 156  QMAKE_CXXFLAGS_DEPS    = $$QMAKE_CFLAGS_DEPS
 157  QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
 158 Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++/qmake.conf
 159 ===================================================================
 160 --- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++/qmake.conf       2005-06-06 16:35:00.000000000 +0200
 161 +++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++/qmake.conf    2005-06-15 21:40:24.000000000 +0200
 162 @@ -8,7 +8,7 @@
 163  QT                     += core gui
 164  QMAKE_INCREMENTAL_STYLE = sublib
 165
 166 -QMAKE_CC               = gcc
 167 +QMAKE_CC               = $(CCACHE) gcc
 168  QMAKE_LEX              = flex
 169  QMAKE_LEXFLAGS         =
 170  QMAKE_YACC             = yacc
 171 @@ -27,7 +27,7 @@
 172  QMAKE_CFLAGS_THREAD    = -D_REENTRANT
 173  QMAKE_CFLAGS_HIDESYMS   = -fvisibility=hidden
 174
 175 -QMAKE_CXX              = g++
 176 +QMAKE_CXX              = $(CCACHE) g++
 177  QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS
 178  QMAKE_CXXFLAGS_DEPS    = $$QMAKE_CFLAGS_DEPS
 179  QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON