[oe-commits] org.oe.dev qt4: add first stab at qt-embedded 4.4.0, the *$%(*$%(#% people at trolltech renamed it *again*, so we probably need to copy all the qtopia core stuff and do s/qtopia-core/qt-embedded/g

koen commit oe at amethyst.openembedded.net
Tue Jul 8 08:50:06 UTC 2008


qt4: add first stab at qt-embedded 4.4.0, the *$%(*$%(#% people at trolltech renamed it *again*, so we probably need to copy all the qtopia core stuff and do s/qtopia-core/qt-embedded/g

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 37d09a616f6097878757dc06831907508687b9f8
ViewMTN: http://monotone.openembedded.org/revision/info/37d09a616f6097878757dc06831907508687b9f8
Files:
1
packages/qt4/qt-embedded-4.4.0
packages/qt4/qt-embedded-4.4.0/0001-cross-compile.patch
packages/qt4/qt-embedded-4.4.0/0004-no-qmake.patch
packages/qt4/qt-embedded-4.4.0/0005-fix-mkspecs.patch
packages/qt4/qt-embedded-4.4.0/0006-freetype-host-includes.patch
packages/qt4/qt-embedded-4.4.0/0007-openssl-host-includes.patch
packages/qt4/qt-embedded-4.4.0/allow-configure-plugins.patch
packages/qt4/qt-embedded-4.4.0/build-tools.patch
packages/qt4/qt-embedded-4.4.0/linux-oe-qmake.conf
packages/qt4/qt-embedded-4.4.0/qconfig-oe.h
packages/qt4/qt-embedded_4.4.0.bb
Diffs:

#
# mt diff -r01c449d5fd5c0bf51f73268e1b8741346d53a668 -r37d09a616f6097878757dc06831907508687b9f8
#
#
#
# add_dir "packages/qt4/qt-embedded-4.4.0"
# 
# add_file "packages/qt4/qt-embedded-4.4.0/0001-cross-compile.patch"
#  content [2efe9cfa1a60cd53e732b11c53b902203fd7049c]
# 
# add_file "packages/qt4/qt-embedded-4.4.0/0004-no-qmake.patch"
#  content [3161380072937eb18db9e2b0e7ab732d8a1ad0e8]
# 
# add_file "packages/qt4/qt-embedded-4.4.0/0005-fix-mkspecs.patch"
#  content [e0202ec32ac08327d4432d53f000d1500072e47a]
# 
# add_file "packages/qt4/qt-embedded-4.4.0/0006-freetype-host-includes.patch"
#  content [3570223a649acdeb59d0a0d14207bea417a9c8b5]
# 
# add_file "packages/qt4/qt-embedded-4.4.0/0007-openssl-host-includes.patch"
#  content [a1b4e6415d9a946ffd9c11915b871187c76f8245]
# 
# add_file "packages/qt4/qt-embedded-4.4.0/allow-configure-plugins.patch"
#  content [c3b316fee55e5f2f5eecd54f37cdc88af92b9956]
# 
# add_file "packages/qt4/qt-embedded-4.4.0/build-tools.patch"
#  content [6612f0ee0a17e0dbc12ea3bed6fa66232e887240]
# 
# add_file "packages/qt4/qt-embedded-4.4.0/linux-oe-qmake.conf"
#  content [40e5550b5f9b6f0041674c58f49f96eb79c0076a]
# 
# add_file "packages/qt4/qt-embedded-4.4.0/qconfig-oe.h"
#  content [b03c0cf1186234b787173c4ebb4d6ee12103b1b6]
# 
# add_file "packages/qt4/qt-embedded_4.4.0.bb"
#  content [460da19be2bbc72d0a380023d5eaeffeb10a3e90]
#
============================================================
--- packages/qt4/qt-embedded-4.4.0/0001-cross-compile.patch	2efe9cfa1a60cd53e732b11c53b902203fd7049c
+++ packages/qt4/qt-embedded-4.4.0/0001-cross-compile.patch	2efe9cfa1a60cd53e732b11c53b902203fd7049c
@@ -0,0 +1,32 @@
+--- /tmp/configure	2008-07-08 10:01:36.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.0/configure	2008-07-08 10:23:04.000000000 +0200
+@@ -762,7 +762,7 @@
+             UNKNOWN_ARG=yes
+         fi
+         ;;
+-    -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config)
++    -prefix|-docdir|-headerdir|-plugindir|-datadir|-libdir|-bindir|-translationdir|-sysconfdir|-examplesdir|-demosdir|-depths|-make|-nomake|-platform|-xplatform|-buildkey|-sdk|-arch|-host-arch|-mysql_config|-crossarch)
+         VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
+         shift
+         VAL="$1"
+@@ -1179,7 +1179,10 @@
+     xplatform)
+         XPLATFORM="$VAL"
+         ;;
+-    debug-and-release)
++	crossarch)
++		CROSSARCH="$VAL"
++		;;
++	debug-and-release)
+         if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+             CFG_DEBUG_RELEASE="$VAL"
+         else
+@@ -2417,6 +2420,8 @@
+     ARCH=$HOST_ARCH
+ fi
+ 
++ARCH="$CROSSARCH"
++
+ if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then
+     if [ "$OPT_VERBOSE" = "yes" ]; then
+         echo "    '$ARCH' is supported"
============================================================
--- packages/qt4/qt-embedded-4.4.0/0004-no-qmake.patch	3161380072937eb18db9e2b0e7ab732d8a1ad0e8
+++ packages/qt4/qt-embedded-4.4.0/0004-no-qmake.patch	3161380072937eb18db9e2b0e7ab732d8a1ad0e8
@@ -0,0 +1,25 @@
+From f5a73ce944240de9013cc23288c115e8213add5e Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker at klever.net>
+Date: Sat, 2 Jun 2007 16:06:59 +0200
+Subject: [PATCH] no qmake
+
+---
+ configure |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure b/configure
+index b3c2a52..1901e57 100755
+--- a/configure
++++ b/configure
+@@ -3517,7 +3517,7 @@ END {
+ }
+ 
+ # build qmake
+-if true; then ###[ '!' -f "$outpath/bin/qmake" ];
++if false; then ###[ '!' -f "$outpath/bin/qmake" ];
+     echo "Creating qmake. Please wait..."
+ 
+     OLD_QCONFIG_H=
+-- 
+1.5.0.7
+
============================================================
--- packages/qt4/qt-embedded-4.4.0/0005-fix-mkspecs.patch	e0202ec32ac08327d4432d53f000d1500072e47a
+++ packages/qt4/qt-embedded-4.4.0/0005-fix-mkspecs.patch	e0202ec32ac08327d4432d53f000d1500072e47a
@@ -0,0 +1,101 @@
+--- /tmp/g++.conf	2008-07-08 10:32:18.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.0/mkspecs/common/g++.conf	2008-07-08 10:34:15.000000000 +0200
+@@ -2,12 +2,12 @@
+ # qmake configuration for common gcc
+ #
+ 
+-QMAKE_CC		= gcc
+-QMAKE_CFLAGS		+= -pipe
++QMAKE_CC       = $(OE_QMAKE_CC)
++QMAKE_CFLAGS       += -pipe $(OE_QMAKE_CFLAGS)
+ QMAKE_CFLAGS_DEPS	+= -M
+ QMAKE_CFLAGS_WARN_ON	+= -Wall -W
+ QMAKE_CFLAGS_WARN_OFF	+= -w
+-QMAKE_CFLAGS_RELEASE	+= -O2
++QMAKE_CFLAGS_RELEASE	+= 
+ QMAKE_CFLAGS_DEBUG	+= -g
+ QMAKE_CFLAGS_SHLIB	+= -fPIC
+ QMAKE_CFLAGS_STATIC_LIB	+= -fPIC
+@@ -16,8 +16,8 @@
+ QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+ QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE}
+ 
+-QMAKE_CXX		= g++
+-QMAKE_CXXFLAGS		+= $$QMAKE_CFLAGS
++QMAKE_CXX      = $(OE_QMAKE_CXX)
++QMAKE_CXXFLAGS     += $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS)
+ QMAKE_CXXFLAGS_DEPS	+= $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON	+= $$QMAKE_CFLAGS_WARN_ON
+ QMAKE_CXXFLAGS_WARN_OFF	+= $$QMAKE_CFLAGS_WARN_OFF
+@@ -30,9 +30,9 @@
+ QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
+ QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
+ 
+-QMAKE_LINK		= g++
+-QMAKE_LINK_SHLIB	= g++
+-QMAKE_LFLAGS		+=
++QMAKE_LINK     = $(OE_QMAKE_LINK)
++QMAKE_LINK_SHLIB   = $(OE_QMAKE_LINK)
++QMAKE_LFLAGS       += $(OE_QMAKE_LDFLAGS)
+ QMAKE_LFLAGS_RELEASE	+=
+ QMAKE_LFLAGS_DEBUG	+=
+ QMAKE_LFLAGS_APP	+=
+@@ -41,7 +41,7 @@
+ QMAKE_LFLAGS_SONAME	+= -Wl,-soname,
+ QMAKE_LFLAGS_THREAD	+=
+ QMAKE_LFLAGS_NOUNDEF	+= -Wl,--no-undefined
+-QMAKE_RPATH		= -Wl,-rpath,
++QMAKE_RPATH        = -Wl,-rpath-link,
+ 
+ QMAKE_PCH_OUTPUT_EXT    = .gch
+ 
+--- /tmp/linux.conf	2008-07-08 10:32:18.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.0/mkspecs/common/linux.conf	2008-07-08 10:38:37.000000000 +0200
+@@ -7,26 +7,27 @@
+ 
+ QMAKE_INCDIR          =
+ QMAKE_LIBDIR          =
+-QMAKE_INCDIR_X11      = /usr/X11R6/include
+-QMAKE_LIBDIR_X11      = /usr/X11R6/lib
+-QMAKE_INCDIR_QT       = $$[QT_INSTALL_HEADERS]
+-QMAKE_LIBDIR_QT       = $$[QT_INSTALL_LIBS]
+-QMAKE_INCDIR_OPENGL   = /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL   = /usr/X11R6/lib
++QMAKE_INCDIR_X11      =
++QMAKE_LIBDIR_X11      =
++QMAKE_INCDIR_QT       = $(OE_QMAKE_INCDIR_QT)
++QMAKE_LIBDIR_QT       = $(OE_QMAKE_LIBDIR_QT)
++QMAKE_INCDIR_OPENGL   =
++QMAKE_LIBDIR_OPENGL   =
++
+ 
+ QMAKE_LIBS            =
+ QMAKE_LIBS_DYNLOAD    = -ldl
+-QMAKE_LIBS_X11        = -lXext -lX11 -lm
+-QMAKE_LIBS_X11SM      = -lSM -lICE
++QMAKE_LIBS_X11        = $(OE_QMAKE_LIBS_X11)
++QMAKE_LIBS_X11SM      = $(OE_QMAKE_LIBS_X11SM)
+ QMAKE_LIBS_NIS        = -lnsl
+ QMAKE_LIBS_OPENGL     = -lGLU -lGL
+ QMAKE_LIBS_OPENGL_QT  = -lGL
+ QMAKE_LIBS_THREAD     = -lpthread
+ 
+-QMAKE_MOC             = $$[QT_INSTALL_BINS]/moc
+-QMAKE_UIC             = $$[QT_INSTALL_BINS]/uic
++QMAKE_MOC             = $(OE_QMAKE_MOC)
++QMAKE_UIC             = $(OE_QMAKE_UIC)
+ 
+-QMAKE_AR              = ar cqs
++QMAKE_AR              = $(OE_QMAKE_AR) cqs
+ QMAKE_OBJCOPY         = objcopy
+ QMAKE_RANLIB          =
+ 
+@@ -39,7 +40,7 @@
+ QMAKE_MOVE            = mv -f
+ QMAKE_DEL_FILE        = rm -f
+ QMAKE_DEL_DIR         = rmdir
+-QMAKE_STRIP           = strip
++QMAKE_STRIP           = $(OE_QMAKE_STRIP)
+ QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+ QMAKE_CHK_DIR_EXISTS  = test -d
+ QMAKE_MKDIR           = mkdir -p
============================================================
--- packages/qt4/qt-embedded-4.4.0/0006-freetype-host-includes.patch	3570223a649acdeb59d0a0d14207bea417a9c8b5
+++ packages/qt4/qt-embedded-4.4.0/0006-freetype-host-includes.patch	3570223a649acdeb59d0a0d14207bea417a9c8b5
@@ -0,0 +1,23 @@
+From c9ab62bd9a56643574b3ae6e59e0ca776d4860d2 Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker at klever.net>
+Date: Mon, 4 Jun 2007 14:48:50 +0200
+Subject: [PATCH] freetype host includes
+
+---
+ config.tests/unix/freetype/freetype.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri
+index 84974bf..ab9a6f2 100644
+--- a/config.tests/unix/freetype/freetype.pri
++++ b/config.tests/unix/freetype/freetype.pri
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
+         p = $$join(p, "", "", "/freetype2")
+         exists($$p):INCLUDEPATH *= $$p
+-- 
+1.5.0.7
+
============================================================
--- packages/qt4/qt-embedded-4.4.0/0007-openssl-host-includes.patch	a1b4e6415d9a946ffd9c11915b871187c76f8245
+++ packages/qt4/qt-embedded-4.4.0/0007-openssl-host-includes.patch	a1b4e6415d9a946ffd9c11915b871187c76f8245
@@ -0,0 +1,23 @@
+From d45943adb443ad4b85ca4504952dee743c675e1e Mon Sep 17 00:00:00 2001
+From: Michael Krelin <hacker at klever.net>
+Date: Mon, 4 Jun 2007 14:58:34 +0200
+Subject: [PATCH] openssl host includes
+
+---
+ config.tests/unix/openssl/openssl.pri |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/config.tests/unix/openssl/openssl.pri b/config.tests/unix/openssl/openssl.pri
+index 756e5fe..19b4061 100644
+--- a/config.tests/unix/openssl/openssl.pri
++++ b/config.tests/unix/openssl/openssl.pri
+@@ -1,5 +1,5 @@
+ !cross_compile {
+-    TRY_INCLUDEPATHS = /include /usr/include /usr/local/include $$QMAKE_INCDIR $$INCLUDEPATH
++    TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$INCLUDEPATH
+     for(p, TRY_INCLUDEPATHS) {
+         pp = $$join(p, "", "", "/openssl")
+         exists($$pp):INCLUDEPATH *= $$p
+-- 
+1.5.0.7
+
============================================================
--- packages/qt4/qt-embedded-4.4.0/allow-configure-plugins.patch	c3b316fee55e5f2f5eecd54f37cdc88af92b9956
+++ packages/qt4/qt-embedded-4.4.0/allow-configure-plugins.patch	c3b316fee55e5f2f5eecd54f37cdc88af92b9956
@@ -0,0 +1,62 @@
+Index: qtopia-core-opensource-src-4.3.3/configure
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/configure	2008-01-20 11:42:07.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/configure	2008-01-20 22:31:37.000000000 +0100
+@@ -639,10 +639,10 @@
+ 
+ CFG_SQL_AVAILABLE=
+ if [ -d "$relpath/src/plugins/sqldrivers" ]; then
+-  for a in "$relpath/src/plugins/sqldrivers/"*; do
+-     if [ -d "$a" ]; then
+-	 base_a=`basename $a`
+-  	 CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${base_a}"
++  for a in `ls $relpath/src/plugins/sqldrivers/`; do
++     dir="$relpath/src/plugins/sqldrivers/$a"
++     if [ -d "$dir" ]; then
++  	 CFG_SQL_AVAILABLE="${CFG_SQL_AVAILABLE} ${a}"
+ 	 eval "CFG_SQL_${base_a}=auto"
+      fi
+   done
+@@ -650,30 +650,30 @@
+ 
+ CFG_DECORATION_PLUGIN_AVAILABLE=
+ if [ -d "$relpath/src/plugins/decorations" ]; then
+-  for a in "$relpath/src/plugins/decorations/"*; do
+-     if [ -d "$a" ]; then
+-	 base_a=`basename $a`
+-  	 CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${base_a}"
++  for a in `ls $relpath/src/plugins/decorations/`; do
++     dir="$relpath/src/plugins/decorations/$a"
++     if [ -d "$dir" ]; then
++  	 CFG_DECORATION_PLUGIN_AVAILABLE="${CFG_DECORATION_PLUGIN_AVAILABLE} ${a}"
+      fi
+   done
+ fi
+ 
+ CFG_MOUSE_PLUGIN_AVAILABLE=
+ if [ -d "$relpath/src/plugins/mousedrivers" ]; then
+-  for a in "$relpath/src/plugins/mousedrivers/"*; do
+-     if [ -d "$a" ]; then
+-	 base_a=`basename $a`
+-  	 CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${base_a}"
++  for a in `ls $relpath/src/plugins/mousedrivers/`; do
++     dir="$relpath/src/plugins/mousedrivers/$a"
++     if [ -d "$dir" ]; then
++  	 CFG_MOUSE_PLUGIN_AVAILABLE="${CFG_MOUSE_PLUGIN_AVAILABLE} ${a}"
+      fi
+   done
+ fi
+ 
+ CFG_GFX_PLUGIN_AVAILABLE=
+ if [ -d "$relpath/src/plugins/gfxdrivers" ]; then
+-  for a in "$relpath/src/plugins/gfxdrivers/"*; do
+-     if [ -d "$a" ]; then
+-	 base_a=`basename $a`
+-  	 CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${base_a}"
++  for a in `ls $relpath/src/plugins/gfxdrivers/`; do
++     dir="$relpath/src/plugins/gfxdrivers/$a"
++     if [ -d "$dir" ]; then
++  	 CFG_GFX_PLUGIN_AVAILABLE="${CFG_GFX_PLUGIN_AVAILABLE} ${a}"
+      fi
+   done
+   CFG_GFX_OFF="$CFG_GFX_AVAILABLE" # assume all off
============================================================
--- packages/qt4/qt-embedded-4.4.0/build-tools.patch	6612f0ee0a17e0dbc12ea3bed6fa66232e887240
+++ packages/qt4/qt-embedded-4.4.0/build-tools.patch	6612f0ee0a17e0dbc12ea3bed6fa66232e887240
@@ -0,0 +1,28 @@
+Do not disable tools, examples and demos for the QWS build. Use brute-force
+to do this.
+
+Index: qtopia-core-opensource-src-4.3.3/configure
+===================================================================
+--- qtopia-core-opensource-src-4.3.3.orig/configure	2007-12-27 16:30:36.000000000 +0100
++++ qtopia-core-opensource-src-4.3.3/configure	2007-12-27 16:30:52.000000000 +0100
+@@ -2265,13 +2265,13 @@
+     CFG_BUILD_PARTS="$QT_DEFAULT_BUILD_PARTS"
+ 
+     # don't build tools by default when cross-compiling
+-    if [ "$PLATFORM" != "$XPLATFORM" ]; then
+-	CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`
+-    fi
+-fi
+-for nobuild in $CFG_NOBUILD_PARTS; do
+-    CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"`
+-done
++    #if [ "$PLATFORM" != "$XPLATFORM" ]; then
++    #	CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, tools,,g"`
++    #fi
++fi
++#for nobuild in $CFG_NOBUILD_PARTS; do
++#    CFG_BUILD_PARTS=`echo "$CFG_BUILD_PARTS" | sed "s, $nobuild,,g"`
++#done
+ if echo $CFG_BUILD_PARTS | grep -v libs >/dev/null 2>&1; then
+ #    echo
+ #    echo "WARNING: libs is a required part of the build."
============================================================
--- packages/qt4/qt-embedded-4.4.0/linux-oe-qmake.conf	40e5550b5f9b6f0041674c58f49f96eb79c0076a
+++ packages/qt4/qt-embedded-4.4.0/linux-oe-qmake.conf	40e5550b5f9b6f0041674c58f49f96eb79c0076a
@@ -0,0 +1,95 @@
+#
+# qmake configuration for linux-oe-g++ / OpenEmbedded Build System / http://openembedded.org
+#
+
+MAKEFILE_GENERATOR	= UNIX
+TEMPLATE		= app
+CONFIG			+= qt warn_on release link_prl
+QT                      += core gui network
+QMAKE_INCREMENTAL_STYLE = sublib
+
+QMAKE_CC		= $(OE_QMAKE_CC)
+QMAKE_LEX		= flex
+QMAKE_LEXFLAGS		=
+QMAKE_YACC		= yacc
+QMAKE_YACCFLAGS		= -d
+QMAKE_YACCFLAGS_MANGLE  = -p $base -b $base
+QMAKE_YACC_HEADER       = $base.tab.h
+QMAKE_YACC_SOURCE       = $base.tab.c
+QMAKE_CFLAGS		= -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA)
+QMAKE_CFLAGS_DEPS	= -M
+QMAKE_CFLAGS_WARN_ON	= -Wall -W
+QMAKE_CFLAGS_WARN_OFF	=
+QMAKE_CFLAGS_RELEASE	= $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2)
+QMAKE_CFLAGS_DEBUG	= -g
+QMAKE_CFLAGS_SHLIB	= -fPIC
+QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_THREAD	= -D_REENTRANT
+QMAKE_CFLAGS_HIDESYMS   = -fvisibility=hidden
+
+QMAKE_CXX		= $(OE_QMAKE_CXX)
+QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA)
+QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+QMAKE_CXXFLAGS_WARN_OFF	= $$QMAKE_CFLAGS_WARN_OFF
+QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
+QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
+QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
+QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden
+
+QMAKE_INCDIR		=
+QMAKE_LIBDIR		=
+QMAKE_INCDIR_X11	= 
+QMAKE_LIBDIR_X11	= 
+QMAKE_INCDIR_QT		= $(OE_QMAKE_INCDIR_QT)
+QMAKE_LIBDIR_QT		= $(OE_QMAKE_LIBDIR_QT)
+QMAKE_INCDIR_OPENGL	=
+QMAKE_LIBDIR_OPENGL	=
+QMAKE_INCDIR_QTOPIA     = $(OE_QMAKE_INCDIR_QTOPIA)
+QMAKE_LIBDIR_QTOPIA     = $(OE_QMAKE_LIBDIR_QTOPIA)
+
+
+QMAKE_LINK		= $(OE_QMAKE_LINK)
+QMAKE_LINK_SHLIB	= $(OE_QMAKE_LINK)
+QMAKE_LFLAGS		= $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA)
+QMAKE_LFLAGS_RELEASE	=
+QMAKE_LFLAGS_DEBUG	=
+QMAKE_LFLAGS_SHLIB      = -shared
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+QMAKE_LFLAGS_SONAME     = -Wl,-soname,
+QMAKE_LFLAGS_THREAD     =
+QMAKE_RPATH             = -Wl,-rpath-link,
+
+QMAKE_LIBS		= $(LIBS_EXTRA)
+QMAKE_LIBS_DYNLOAD      = -ldl
+QMAKE_LIBS_X11		= 
+QMAKE_LIBS_X11SM	=  
+QMAKE_LIBS_QT		= -lqte
+QMAKE_LIBS_QT_THREAD    = -lqte-mt
+QMAKE_LIBS_QT_OPENGL	= -lqgl
+QMAKE_LIBS_THREAD       =%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list