[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-50-ge0a7cfa
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-50-ge0a7cfa
|
From: jscheer <js...@us...> - 2010-10-11 09:44:19
|
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 e0a7cfa4174aafa5e21d483583e22b2a06915d54 (commit)
via f377feb11486917104fdabcd7f6ae31e3822b618 (commit)
from f51c74f63182219732b914a0e2482887292f9b9f (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 e0a7cfa4174aafa5e21d483583e22b2a06915d54
Merge: f377feb11486917104fdabcd7f6ae31e3822b618 f51c74f63182219732b914a0e2482887292f9b9f
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Oct 11 11:43:47 2010 +0200
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit f377feb11486917104fdabcd7f6ae31e3822b618
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Oct 11 11:37:55 2010 +0200
[BUILDROOT] Modifications in patch 132-qt-full_integration_with_cross_compiling.patch : Change Qt demos & examples directory on install and target. Use the variable QT_VERSION instead of the number in the Makefile.
-----------------------------------------------------------------------
Summary of changes:
...-qt-full_integration_with_cross_compiling.patch | 26 ++++++++++----------
...-qt-full_integration_with_cross_compiling.patch | 22 ++++++++--------
2 files changed, 24 insertions(+), 24 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 51b9162..559de40 100644
--- a/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/132-qt-full_integration_with_cross_compiling.patch
@@ -5,8 +5,8 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/qtopia4/Config.in
===================================================================
---- buildroot.orig/package/qtopia4/Config.in 2010-10-06 16:58:24.000000000 +0200
-+++ buildroot/package/qtopia4/Config.in 2010-10-06 16:58:24.000000000 +0200
+--- 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
@@ -325,4 +325,14 @@
Build the Qt Script Tools module.
if unsure, say n.
@@ -24,8 +24,8 @@ Index: buildroot/package/qtopia4/Config.in
endif # BR2_PACKAGE_QT
Index: buildroot/package/qtopia4/qtopia4.mk
===================================================================
---- buildroot.orig/package/qtopia4/qtopia4.mk 2010-10-06 16:58:24.000000000 +0200
-+++ buildroot/package/qtopia4/qtopia4.mk 2010-10-07 11:37:07.000000000 +0200
+--- 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 @@
QT_CONFIGURE+= -no-stl
endif
@@ -45,8 +45,8 @@ Index: buildroot/package/qtopia4/qtopia4.mk
-no-accessibility \
-no-separate-debug-info \
-prefix /usr \
-+ -examplesdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples \
-+ -demosdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos \
++ -examplesdir $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples \
++ -demosdir $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos \
-hostprefix $(STAGING_DIR)/usr \
-fast \
-no-rpath \
@@ -59,20 +59,20 @@ Index: buildroot/package/qtopia4/qtopia4.mk
cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
endif
-+$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/demos.pro:
++$(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/demos.pro:
+ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
-+ mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos
-+ cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/demos/
++ 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/
+endif
+
-+$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/examples.pro:
++$(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/examples.pro:
+ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
-+ mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples
-+ cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/
++ 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/
+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/Trolltech/QtEmbedded-4.5.3-arm/demos/demos.pro $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.5.3-arm/examples/examples.pro
++$(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
# 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 a0641c5..9922cbf 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-06 16:56:09.000000000 +0200
++++ buildroot/package/qt/Config.in 2010-10-11 10:36:06.000000000 +0200
@@ -372,4 +372,14 @@
Build the Qt Script Tools module.
if unsure, say n.
@@ -25,7 +25,7 @@ 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-07 11:44:13.000000000 +0200
++++ buildroot/package/qt/qt.mk 2010-10-11 10:55:00.000000000 +0200
@@ -362,6 +362,14 @@
QT_CONFIGURE+= -no-stl
endif
@@ -45,8 +45,8 @@ Index: buildroot/package/qt/qt.mk
-no-accessibility \
-no-separate-debug-info \
-prefix /usr \
-+ -examplesdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples \
-+ -demosdir $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos \
++ -examplesdir $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples \
++ -demosdir $(STAGING_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos \
-hostprefix $(STAGING_DIR)/usr \
-fast \
-no-rpath \
@@ -59,20 +59,20 @@ Index: buildroot/package/qt/qt.mk
cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
endif
-+$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/demos.pro:
++$(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/demos/demos.pro:
+ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
-+ mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos
-+ cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/demos/
++ 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/
+endif
+
-+$(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/examples.pro:
++$(TARGET_DIR)/usr/local/QtEmbedded-$(QT_VERSION)-arm/examples/examples.pro:
+ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
-+ mkdir -p $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples
-+ cp -dpfR $(STAGING_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/* $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/
++ 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/
+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/Trolltech/QtEmbedded-4.6.2-arm/demos/demos.pro $(TARGET_DIR)/usr/local/Trolltech/QtEmbedded-4.6.2-arm/examples/examples.pro
++$(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
# 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
|
