org.handhelds.familiar/packages/qte/qte-4.0.0-snapshot/fix-mkspecs.patch

   1
   2 #
   3 # Patch managed by http://www.holgerschurig.de/patcher.html
   4 #
   5
   6 --- qt-embedded-opensource-4.0.0-b2-snapshot-20050128/mkspecs/qws/linux-arm-g++/qmake.conf~fix-mkspecs
   7 +++ qt-embedded-opensource-4.0.0-b2-snapshot-20050128/mkspecs/qws/linux-arm-g++/qmake.conf
   8 @@ -8,12 +8,12 @@
   9  QT                      += core gui network
  10  QMAKE_INCREMENTAL_STYLE = sublib
  11
  12 -QMAKE_CC               = arm-linux-gcc
  13 +QMAKE_CC               = $(CCACHE) arm-linux-gcc
  14  QMAKE_LEX              = flex
  15  QMAKE_LEXFLAGS         =
  16  QMAKE_YACC             = yacc
  17  QMAKE_YACCFLAGS                = -d
  18 -QMAKE_CFLAGS           = -pipe
  19 +QMAKE_CFLAGS           = -pipe $(EXTRA_CFLAGS)
  20  QMAKE_CFLAGS_WARN_ON   = -Wall -W
  21  QMAKE_CFLAGS_WARN_OFF  =
  22  QMAKE_CFLAGS_RELEASE   = -O2
  23 @@ -22,8 +22,8 @@
  24  QMAKE_CFLAGS_YACC      = -Wno-unused -Wno-parentheses
  25  QMAKE_CFLAGS_THREAD    = -D_REENTRANT
  26
  27 -QMAKE_CXX              = arm-linux-g++
  28 -QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti
  29 +QMAKE_CXX              = $(CCACHE) arm-linux-g++
  30 +QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti $(EXTRA_CXXFLAGS)
  31  QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
  32  QMAKE_CXXFLAGS_WARN_OFF        = $$QMAKE_CFLAGS_WARN_OFF
  33  QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
  34 @@ -45,14 +45,14 @@
  35
  36  QMAKE_LINK             = arm-linux-g++
  37  QMAKE_LINK_SHLIB       = arm-linux-g++
  38 -QMAKE_LFLAGS           =
  39 +QMAKE_LFLAGS           = $(EXTRA_LFLAGS)
  40  QMAKE_LFLAGS_RELEASE   =
  41  QMAKE_LFLAGS_DEBUG     =
  42  QMAKE_LFLAGS_SHLIB      = -shared
  43  QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
  44  QMAKE_LFLAGS_SONAME     = -Wl,-soname,
  45  QMAKE_LFLAGS_THREAD     =
  46 -QMAKE_RPATH             = -Wl,-rpath,
  47 +QMAKE_RPATH             = -Wl,-rpath-link,
  48
  49  QMAKE_LIBS             =
  50  QMAKE_LIBS_DYNLOAD      = -ldl
  51 @@ -66,6 +66,7 @@
  52
  53  QMAKE_MOC              = $$[QT_INSTALL_BINS]/moc
  54  QMAKE_UIC              = $$[QT_INSTALL_BINS]/uic
  55 +QMAKE_RCC              = rcc4
  56
  57  QMAKE_AR               = ar cqs
  58  QMAKE_RANLIB           =
  59 --- qt-embedded-opensource-4.0.0-b2-snapshot-20050128/mkspecs/features/resources.prf~fix-mkspecs
  60 +++ qt-embedded-opensource-4.0.0-b2-snapshot-20050128/mkspecs/features/resources.prf
  61 @@ -1,6 +1,6 @@
  62  isEmpty(QMAKE_RCC) {
  63      win32:QMAKE_RCC = $$[QT_INSTALL_BINS]\rcc.exe
  64 -    else:QMAKE_RCC = $$[QT_INSTALL_BINS]/rcc
  65 +    else:QMAKE_RCC = rcc4
  66  }
  67
  68  isEmpty(RCC_DIR):RCC_DIR = .