[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-51-gde19d85
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-51-gde19d85
|
From: jscheer <js...@us...> - 2010-10-11 15:34:20
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via de19d8512418c1990eaa3cff15cbcffa4187be85 (commit)
from e0a7cfa4174aafa5e21d483583e22b2a06915d54 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit de19d8512418c1990eaa3cff15cbcffa4187be85
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Oct 11 17:33:53 2010 +0200
[BUILDROOT] Changes in patch 132-qt-full_integration_with_cross_compiling.patch : name of demos directory & use of variable QT_DEMOS_DIR.
-----------------------------------------------------------------------
Summary of changes:
...-qt-full_integration_with_cross_compiling.patch | 36 ++++++++++++--------
...-qt-full_integration_with_cross_compiling.patch | 36 ++++++++++++--------
2 files changed, 44 insertions(+), 28 deletions(-)
diff --git a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
index 559de40..8b76ea6 100644
--- a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
@@ -6,7 +6,7 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/qtopia4/Config.in
===================================================================
--- buildroot.orig/package/qtopia4/Config.in 2010-10-11 09:38:44.000000000 +0200
-+++ buildroot/package/qtopia4/Config.in 2010-10-11 09:38:44.000000000 +0200
++++ buildroot/package/qtopia4/Config.in 2010-10-11 09:49:36.000000000 +0200
@@ -325,4 +325,14 @@
Build the Qt Script Tools module.
if unsure, say n.
@@ -25,8 +25,16 @@ Index: buildroot/package/qtopia4/Config.in
Index: buildroot/package/qtopia4/qtopia4.mk
===================================================================
--- buildroot.orig/package/qtopia4/qtopia4.mk 2010-10-11 09:38:44.000000000 +0200
-+++ buildroot/package/qtopia4/qtopia4.mk 2010-10-11 09:46:39.000000000 +0200
-@@ -345,6 +345,14 @@
++++ buildroot/package/qtopia4/qtopia4.mk 2010-10-11 16:36:12.000000000 +0200
+@@ -17,6 +17,7 @@
+ QT_SITE:=http://get.qt.nokia.com/qt/source
+ QT_CAT:=$(ZCAT)
+ QT_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QT_VERSION)
++QT_DEMOS_DIR:=/usr/local/qt-embedded-$(QT_VERSION)
+
+ QT_CONFIGURE:=#empty
+
+@@ -345,6 +346,14 @@
QT_CONFIGURE+= -no-stl
endif
@@ -41,12 +49,12 @@ Index: buildroot/package/qtopia4/qtopia4.mk
# ccache and precompiled headers don't play well together
ifeq ($(BR2_CCACHE),y)
QT_CONFIGURE += -no-pch
-@@ -483,11 +491,11 @@
+@@ -483,11 +492,11 @@
-no-accessibility \
-no-separate-debug-info \
-prefix /usr \
-+ -examplesdir $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples \
-+ -demosdir $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos \
++ -examplesdir $(STAGING_DIR)/$(QT_DEMOS_DIR)-arm/examples \
++ -demosdir $(STAGING_DIR)/$(QT_DEMOS_DIR)-arm/demos \
-hostprefix $(STAGING_DIR)/usr \
-fast \
-no-rpath \
@@ -55,24 +63,24 @@ Index: buildroot/package/qtopia4/qtopia4.mk
)
touch $@
-@@ -560,8 +568,19 @@
+@@ -560,8 +569,19 @@
cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
endif
-+$(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/demos.pro:
++$(TARGET_DIR)/$(QT_DEMOS_DIR)/demos/demos.pro:
+ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
-+ mkdir -p $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos
-+ cp -dpfR $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/* $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/
++ mkdir -p $(TARGET_DIR)/$(QT_DEMOS_DIR)/demos
++ cp -dpfR $(STAGING_DIR)/$(QT_DEMOS_DIR)-arm/demos/* $(TARGET_DIR)/$(QT_DEMOS_DIR)/demos/
+endif
+
-+$(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/examples.pro:
++$(TARGET_DIR)/$(QT_DEMOS_DIR)/examples/examples.pro:
+ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
-+ mkdir -p $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples
-+ cp -dpfR $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/* $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/
++ mkdir -p $(TARGET_DIR)/$(QT_DEMOS_DIR)/examples
++ cp -dpfR $(STAGING_DIR)/$(QT_DEMOS_DIR)-arm/examples/* $(TARGET_DIR)/$(QT_DEMOS_DIR)/examples/
+endif
-$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
-+$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/demos.pro $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/examples.pro
++$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) $(TARGET_DIR)/$(QT_DEMOS_DIR)/demos/demos.pro $(TARGET_DIR)/$(QT_DEMOS_DIR)/examples/examples.pro
# Strip all installed libs
ifeq ($(BR2_PACKAGE_QT_SHARED),y)
cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/
diff --git a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
index 9922cbf..cf3e443 100644
--- a/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/2010.05/132-qt-full_integration_with_cross_compiling.patch
@@ -6,7 +6,7 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/qt/Config.in
===================================================================
--- buildroot.orig/package/qt/Config.in 2010-05-30 22:24:10.000000000 +0200
-+++ buildroot/package/qt/Config.in 2010-10-11 10:36:06.000000000 +0200
++++ buildroot/package/qt/Config.in 2010-10-11 10:58:47.000000000 +0200
@@ -372,4 +372,14 @@
Build the Qt Script Tools module.
if unsure, say n.
@@ -25,8 +25,16 @@ Index: buildroot/package/qt/Config.in
Index: buildroot/package/qt/qt.mk
===================================================================
--- buildroot.orig/package/qt/qt.mk 2010-05-30 22:24:10.000000000 +0200
-+++ buildroot/package/qt/qt.mk 2010-10-11 10:55:00.000000000 +0200
-@@ -362,6 +362,14 @@
++++ buildroot/package/qt/qt.mk 2010-10-11 17:11:18.000000000 +0200
+@@ -17,6 +17,7 @@
+ QT_SITE:=http://get.qt.nokia.com/qt/source
+ QT_CAT:=$(ZCAT)
+ QT_TARGET_DIR:=$(BUILD_DIR)/qt-everywhere-opensource-src-$(QT_VERSION)
++QT_DEMOS_DIR:=/usr/local/qt-embedded-$(QT_VERSION)
+
+ QT_CONFIGURE:=#empty
+
+@@ -362,6 +363,14 @@
QT_CONFIGURE+= -no-stl
endif
@@ -41,12 +49,12 @@ Index: buildroot/package/qt/qt.mk
# ccache and precompiled headers don't play well together
ifeq ($(BR2_CCACHE),y)
QT_CONFIGURE += -no-pch
-@@ -507,11 +515,11 @@
+@@ -507,11 +516,11 @@
-no-accessibility \
-no-separate-debug-info \
-prefix /usr \
-+ -examplesdir $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples \
-+ -demosdir $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos \
++ -examplesdir $(STAGING_DIR)/$(QT_DEMOS_DIR)-arm/examples \
++ -demosdir $(STAGING_DIR)/$(QT_DEMOS_DIR)-arm/demos \
-hostprefix $(STAGING_DIR)/usr \
-fast \
-no-rpath \
@@ -55,24 +63,24 @@ Index: buildroot/package/qt/qt.mk
)
touch $@
-@@ -589,8 +597,19 @@
+@@ -589,8 +598,19 @@
cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
endif
-+$(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/demos.pro:
++$(TARGET_DIR)/$(QT_DEMOS_DIR)/demos/demos.pro:
+ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
-+ mkdir -p $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos
-+ cp -dpfR $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/* $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/
++ mkdir -p $(TARGET_DIR)/$(QT_DEMOS_DIR)/demos
++ cp -dpfR $(STAGING_DIR)/$(QT_DEMOS_DIR)-arm/demos/* $(TARGET_DIR)/$(QT_DEMOS_DIR)/demos/
+endif
+
-+$(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/examples.pro:
++$(TARGET_DIR)/$(QT_DEMOS_DIR)/examples/examples.pro:
+ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
-+ mkdir -p $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples
-+ cp -dpfR $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/* $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/
++ mkdir -p $(TARGET_DIR)/$(QT_DEMOS_DIR)/examples
++ cp -dpfR $(STAGING_DIR)/$(QT_DEMOS_DIR)-arm/examples/* $(TARGET_DIR)/$(QT_DEMOS_DIR)/examples/
+endif
-$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS)
-+$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/demos.pro $(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/examples.pro
++$(TARGET_DIR)/usr/lib/libQtCore.so.4: $(STAGING_DIR)/usr/lib/libQtCore.la $(QT_LIBS) $(TARGET_DIR)/$(QT_DEMOS_DIR)/demos/demos.pro $(TARGET_DIR)/$(QT_DEMOS_DIR)/examples/examples.pro
# Strip all installed libs
ifeq ($(BR2_PACKAGE_QT_SHARED),y)
cp -dpf $(STAGING_DIR)/usr/lib/libQtCore.so.* $(TARGET_DIR)/usr/lib/
hooks/post-receive
--
armadeus
|
