[Qt-interest] Building qt on Solaris 10/AMD64 [patch included]

[Xavier Roche]

Hi again,

On Wed, 26 May 2010, Xavier Roche wrote:
> Summary of minor changes included in the attached patch:
> - */wtf/StringExtras.h : strnstr() has to be defined for Solaris, too
> - src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h : on Solaris, 
> USE_SYSTEM_MALLOC to 0 (see remark below)

Err, damn it, USE_SYSTEM_MALLOC to 1 (to directly use the system malloc 
without the TCMalloc layer), not 0 - my mistake.

Fixed patch attached.
-------------- next part --------------
diff -rudb qt-everywhere-opensource-src-4.6.2.orig/configure qt-everywhere-opensource-src-4.6.2/configure
--- qt-everywhere-opensource-src-4.6.2.orig/configure	2010-02-11 16:55:17.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2/configure	2010-05-26 13:25:51.196718363 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #############################################################################
 ##
 ## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
Seulement dans qt-everywhere-opensource-src-4.6.2: configuree
Seulement dans qt-everywhere-opensource-src-4.6.2: configure.orig
Seulement dans qt-everywhere-opensource-src-4.6.2/src/3rdparty/freetype/builds/unix: configuree
diff -rudb qt-everywhere-opensource-src-4.6.2.orig/src/3rdparty/freetype/configure qt-everywhere-opensource-src-4.6.2/src/3rdparty/freetype/configure
--- qt-everywhere-opensource-src-4.6.2.orig/src/3rdparty/freetype/configure	2010-02-11 16:55:21.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2/src/3rdparty/freetype/configure	2010-05-26 13:25:51.181461660 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Copyright 2002, 2003, 2004, 2005, 2006, 2008 by
 # David Turner, Robert Wilhelm, and Werner Lemberg.
Seulement dans qt-everywhere-opensource-src-4.6.2/src/3rdparty/freetype: configuree
diff -rudb qt-everywhere-opensource-src-4.6.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h qt-everywhere-opensource-src-4.6.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h
--- qt-everywhere-opensource-src-4.6.2.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2/src/3rdparty/javascriptcore/JavaScriptCore/wtf/StringExtras.h	2010-05-26 13:25:24.190592173 +0200
@@ -85,7 +85,7 @@
 
 #endif
 
-#if PLATFORM(WIN_OS) || PLATFORM(LINUX)
+#if PLATFORM(WIN_OS) || PLATFORM(LINUX) || PLATFORM(SOLARIS)
 
 inline char* strnstr(const char* buffer, const char* target, size_t bufferLength)
 {
diff -rudb qt-everywhere-opensource-src-4.6.2.orig/src/3rdparty/libpng/configure qt-everywhere-opensource-src-4.6.2/src/3rdparty/libpng/configure
--- qt-everywhere-opensource-src-4.6.2.orig/src/3rdparty/libpng/configure	2010-02-11 16:55:22.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2/src/3rdparty/libpng/configure	2010-05-26 13:25:51.182562030 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 echo "
   There is no \"configure\" script in this distribution of
   libpng-1.2.40.
Seulement dans qt-everywhere-opensource-src-4.6.2/src/3rdparty/libpng: configuree
Seulement dans qt-everywhere-opensource-src-4.6.2/src/3rdparty/libtiff: configuree
diff -rudb qt-everywhere-opensource-src-4.6.2.orig/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
--- qt-everywhere-opensource-src-4.6.2.orig/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h	2010-02-11 16:55:17.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h	2010-05-26 13:25:24.224530593 +0200
@@ -568,6 +568,7 @@
 #define HAVE_TM_GMTOFF 1
 #define HAVE_TM_ZONE 1
 #define HAVE_TIMEGM 1
+#define USE_SYSTEM_MALLOC 1
 #endif     
 
 #if PLATFORM(DARWIN)
diff -rudb qt-everywhere-opensource-src-4.6.2.orig/src/3rdparty/webkit/JavaScriptCore/wtf/StringExtras.h qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/JavaScriptCore/wtf/StringExtras.h
--- qt-everywhere-opensource-src-4.6.2.orig/src/3rdparty/webkit/JavaScriptCore/wtf/StringExtras.h	2010-02-11 16:55:17.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/JavaScriptCore/wtf/StringExtras.h	2010-05-26 13:25:24.224530593 +0200
@@ -85,7 +85,7 @@
 
 #endif
 
-#if PLATFORM(WIN_OS) || PLATFORM(LINUX)
+#if PLATFORM(WIN_OS) || PLATFORM(LINUX) || PLATFORM(SOLARIS)
 
 inline char* strnstr(const char* buffer, const char* target, size_t bufferLength)
 {
diff -rudb qt-everywhere-opensource-src-4.6.2.orig/src/3rdparty/webkit/WebCore/WebCore.pro qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/WebCore/WebCore.pro
--- qt-everywhere-opensource-src-4.6.2.orig/src/3rdparty/webkit/WebCore/WebCore.pro	2010-02-11 16:55:19.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/WebCore/WebCore.pro	2010-05-26 13:25:24.225573343 +0200
@@ -63,7 +63,7 @@
 }
 
 unix:!mac:*-g++*:QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections 
-unix:!mac:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
+unix:!mac:!solaris-*:*-g++*:QMAKE_LFLAGS += -Wl,--gc-sections
 
 CONFIG(release):!CONFIG(QTDIR_build) {
     contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
Seulement dans qt-everywhere-opensource-src-4.6.2/src/3rdparty/webkit/WebCore: WebCore.pro.orig
diff -rudb qt-everywhere-opensource-src-4.6.2.orig/src/3rdparty/zlib/configure qt-everywhere-opensource-src-4.6.2/src/3rdparty/zlib/configure
--- qt-everywhere-opensource-src-4.6.2.orig/src/3rdparty/zlib/configure	2010-02-11 16:55:20.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2/src/3rdparty/zlib/configure	2010-05-26 13:25:51.112459376 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # configure script for zlib. This script is needed only if
 # you wish to build a shared library and your system supports them,
 # of if you need special compiler, flags or install directory.
Seulement dans qt-everywhere-opensource-src-4.6.2/src/3rdparty/zlib: configuree