components/qt4/patches/qmake-64.patch

   1 --- qt-everywhere-opensource-src-4.8.6/mkspecs/solaris-g++-64/qmake.conf.~1~    2014-04-10 22:37:12.000000000 +0400
   2 +++ qt-everywhere-opensource-src-4.8.6/mkspecs/solaris-g++-64/qmake.conf        2015-01-17 22:12:42.284874397 +0300
   3 @@ -36,7 +36,7 @@
   4  QMAKE_LEXFLAGS         =
   5  QMAKE_YACC             = yacc
   6  QMAKE_YACCFLAGS                = -d
   7 -QMAKE_CFLAGS           = -m64 -D_XOPEN_SOURCE=500 -D__EXTENSIONS__
   8 +QMAKE_CFLAGS           = -m64
   9  QMAKE_CFLAGS_DEPS      = -M
  10  QMAKE_CFLAGS_WARN_ON   = -Wall -W
  11  QMAKE_CFLAGS_WARN_OFF  = -w
  12 @@ -59,14 +59,14 @@
  13  QMAKE_CXXFLAGS_YACC    = $$QMAKE_CFLAGS_YACC
  14  QMAKE_CXXFLAGS_THREAD  = $$QMAKE_CFLAGS_THREAD
  15
  16 -QMAKE_INCDIR           = /usr/sfw/include
  17 -QMAKE_LIBDIR           = /usr/sfw/lib/64
  18 -QMAKE_INCDIR_X11       = /usr/openwin/include
  19 -QMAKE_LIBDIR_X11       = /usr/openwin/lib/64
  20 +QMAKE_INCDIR           = /usr/include
  21 +QMAKE_LIBDIR           = /usr/lib/64
  22 +QMAKE_INCDIR_X11       = /usr/include
  23 +QMAKE_LIBDIR_X11       = /usr/lib/64
  24  QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
  25  QMAKE_LIBDIR_QT                = $$[QT_INSTALL_LIBS]
  26 -QMAKE_INCDIR_OPENGL    = /usr/openwin/include
  27 -QMAKE_LIBDIR_OPENGL    = /usr/openwin/lib/64
  28 +QMAKE_INCDIR_OPENGL    = /usr/include
  29 +QMAKE_LIBDIR_OPENGL    = /usr/lib/64
  30
  31  QMAKE_LINK             = g++
  32  QMAKE_LINK_SHLIB       = g++
  33 @@ -82,7 +82,7 @@
  34  QMAKE_LFLAGS_NOUNDEF   = -z defs
  35  QMAKE_LFLAGS_RPATH     = -Wl,-R,
  36
  37 -QMAKE_LIBS             =
  38 +QMAKE_LIBS             = -m64
  39  QMAKE_LIBS_DYNLOAD     = -ldl
  40  QMAKE_LIBS_X11         = -lXext -lX11 -lresolv -lsocket -lnsl
  41  QMAKE_LIBS_X11SM       = -lSM -lICE