[csw-devel] SF.net SVN: gar:[18148] csw/mgar/pkg/qt4-gcc/trunk

[cgrzemba at users.sourceforge.net]

Revision: 18148
          http://gar.svn.sourceforge.net/gar/?rev=18148&view=rev
Author:   cgrzemba
Date:     2012-05-29 07:20:32 +0000 (Tue, 29 May 2012)
Log Message:
-----------
qt4-gcc/trunk: refine Solaris mkspecs

Modified Paths:
--------------
    csw/mgar/pkg/qt4-gcc/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/qt4-gcc/trunk/files/mkspec-csw.patch

Modified: csw/mgar/pkg/qt4-gcc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/Makefile	2012-05-28 14:04:38 UTC (rev 18147)
+++ csw/mgar/pkg/qt4-gcc/trunk/Makefile	2012-05-29 07:20:32 UTC (rev 18148)
@@ -22,6 +22,8 @@
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
+PATCHFILES += mkspec-csw.patch
+
 # http://wiki.opencsw.org/porting-faq#toc9
 EXTRA_CFLAGS = -DSUN_OGL_NO_VERTEX_MACROS
 EXTRA_CXXFLAGS = -DSUN_OGL_NO_VERTEX_MACROS

Added: csw/mgar/pkg/qt4-gcc/trunk/files/mkspec-csw.patch
===================================================================
--- csw/mgar/pkg/qt4-gcc/trunk/files/mkspec-csw.patch	                        (rev 0)
+++ csw/mgar/pkg/qt4-gcc/trunk/files/mkspec-csw.patch	2012-05-29 07:20:32 UTC (rev 18148)
@@ -0,0 +1,53 @@
+--- a/mkspecs/solaris-cc-64/qmake.conf
++++ b/mkspecs/solaris-cc-64/qmake.conf
+@@ -57,8 +57,8 @@ QMAKE_CXXFLAGS_YACC   = $$QMAKE_CFLAGS_YACC
+ QMAKE_CXXFLAGS_THREAD	 = $$QMAKE_CFLAGS_THREAD
+ QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS
+
+-QMAKE_INCDIR		= /usr/sfw/include
+-QMAKE_LIBDIR		= /usr/sfw/lib/64
++QMAKE_INCDIR		= /opt/csw/include
++QMAKE_LIBDIR		= /opt/csw/lib/64
+ QMAKE_INCDIR_X11	= /usr/openwin/include
+ QMAKE_LIBDIR_X11	= /usr/openwin/lib/64
+ QMAKE_INCDIR_QT                = $$[QT_INSTALL_HEADERS]
+--- a/mkspecs/solaris-cc/qmake.conf
++++ b/mkspecs/solaris-cc/qmake.conf
+@@ -40,8 +40,8 @@ QMAKE_CXXFLAGS_YACC   = $$QMAKE_CFLAGS_YACC
+ QMAKE_CXXFLAGS_THREAD	 = $$QMAKE_CFLAGS_THREAD
+ QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS
+
+-QMAKE_INCDIR		= /usr/sfw/include
+-QMAKE_LIBDIR		= /usr/sfw/lib
++QMAKE_INCDIR		= /opt/csw/include
++QMAKE_LIBDIR		= /opt/csw/lib
+ QMAKE_INCDIR_X11	= /usr/openwin/include
+ QMAKE_LIBDIR_X11	= /usr/openwin/lib
+ QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
+--- a/mkspecs/solaris-g++-64/qmake.conf
++++ b/mkspecs/solaris-g++-64/qmake.conf
+@@ -59,8 +59,8 @@ QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
+ QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
+ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+
+-QMAKE_INCDIR		= /usr/sfw/include
+-QMAKE_LIBDIR		= /usr/sfw/lib/64
++QMAKE_INCDIR		= /opt/csw/gxx/include
++QMAKE_LIBDIR		= /opt/csw/gxx/lib/64
+ QMAKE_INCDIR_X11	= /usr/openwin/include
+ QMAKE_LIBDIR_X11	= /usr/openwin/lib/64
+ QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
+--- a/mkspecs/solaris-g++/qmake.conf
++++ b/mkspecs/solaris-g++/qmake.conf
+@@ -42,8 +42,8 @@ QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
+ QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
+ QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+
+-QMAKE_INCDIR		= /usr/sfw/include
+-QMAKE_LIBDIR		= /usr/sfw/lib
++QMAKE_INCDIR		= /opt/csw/gxx/include
++QMAKE_LIBDIR		= /opt/csw/gxx/lib
+ QMAKE_INCDIR_X11	= /usr/openwin/include
+ QMAKE_LIBDIR_X11	= /usr/openwin/lib
+ QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.