[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-206-ge11ed94
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-206-ge11ed94
|
From: jscheer <js...@us...> - 2011-01-03 17:24:26
|
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 e11ed945defd706a6af5c0620363b77b24169307 (commit)
via 2da7c783f9a88614f55eb9611c2829e21b6b834a (commit)
from 293f7fa6dec6b0421ca1a368138e201579e9c794 (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 e11ed945defd706a6af5c0620363b77b24169307
Merge: 2da7c783f9a88614f55eb9611c2829e21b6b834a 293f7fa6dec6b0421ca1a368138e201579e9c794
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Jan 3 18:23:57 2011 +0100
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 2da7c783f9a88614f55eb9611c2829e21b6b834a
Author: Jeremie Scheer <jer...@ar...>
Date: Mon Jan 3 18:23:29 2011 +0100
[BUILDROOT] Create new patch for Qt's MySQL module configuration fix.
-----------------------------------------------------------------------
Summary of changes:
...-qt-full_integration_with_cross_compiling.patch | 24 +++++--------------
patches/buildroot/141-qt-fix_mysql_module.patch | 18 +++++++++++++++
...-qt-full_integration_with_cross_compiling.patch | 23 +++++--------------
.../2010.11/141-qt-fix_mysql_module.patch | 19 +++++++++++++++
4 files changed, 50 insertions(+), 34 deletions(-)
create mode 100644 patches/buildroot/141-qt-fix_mysql_module.patch
create mode 100644 patches/buildroot/2010.11/141-qt-fix_mysql_module.patch
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 cd89cd1..a7e215e 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 2011-01-03 10:48:45.000000000 +0100
-+++ buildroot/package/qtopia4/Config.in 2011-01-03 10:48:45.000000000 +0100
+--- buildroot.orig/package/qtopia4/Config.in 2011-01-03 10:54:42.000000000 +0100
++++ buildroot/package/qtopia4/Config.in 2011-01-03 10:54:42.000000000 +0100
@@ -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 2011-01-03 10:48:45.000000000 +0100
-+++ buildroot/package/qtopia4/qtopia4.mk 2011-01-03 10:52:31.000000000 +0100
+--- buildroot.orig/package/qtopia4/qtopia4.mk 2011-01-03 10:54:42.000000000 +0100
++++ buildroot/package/qtopia4/qtopia4.mk 2011-01-03 17:22:36.000000000 +0100
@@ -17,6 +17,7 @@
QT_SITE:=http://get.qt.nokia.com/qt/source
QT_CAT:=$(ZCAT)
@@ -34,17 +34,7 @@ Index: buildroot/package/qtopia4/qtopia4.mk
QT_CONFIGURE:=#empty
-@@ -291,7 +292,8 @@
- QT_CONFIGURE+= -qt-sql-ibase
- endif
- ifeq ($(BR2_PACKAGE_QT_MYSQL),y)
--QT_CONFIGURE+= -qt-sql-mysql
-+QT_CONFIGURE+= -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
-+QT_DEP_LIBS+=mysql_client
- endif
- ifeq ($(BR2_PACKAGE_QT_ODBC),y)
- QT_CONFIGURE+= -qt-sql-odbc
-@@ -345,6 +347,14 @@
+@@ -345,6 +346,14 @@
QT_CONFIGURE+= -no-stl
endif
@@ -59,7 +49,7 @@ 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 +493,11 @@
+@@ -483,11 +492,11 @@
-no-accessibility \
-no-separate-debug-info \
-prefix /usr \
@@ -73,7 +63,7 @@ Index: buildroot/package/qtopia4/qtopia4.mk
)
touch $@
-@@ -560,8 +570,19 @@
+@@ -560,8 +569,19 @@
cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
endif
diff --git a/patches/buildroot/141-qt-fix_mysql_module.patch b/patches/buildroot/141-qt-fix_mysql_module.patch
new file mode 100644
index 0000000..bcbd725
--- /dev/null
+++ b/patches/buildroot/141-qt-fix_mysql_module.patch
@@ -0,0 +1,18 @@
+Fix Qt configuration options for MySQL module ; Specifies the MySQL's libraries and headers directories.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+Index: buildroot/package/qtopia4/qtopia4.mk
+===================================================================
+--- buildroot.orig/package/qtopia4/qtopia4.mk 2011-01-03 17:25:36.000000000 +0100
++++ buildroot/package/qtopia4/qtopia4.mk 2011-01-03 17:25:51.000000000 +0100
+@@ -292,7 +292,8 @@
+ QT_CONFIGURE+= -qt-sql-ibase
+ endif
+ ifeq ($(BR2_PACKAGE_QT_MYSQL),y)
+-QT_CONFIGURE+= -qt-sql-mysql
++QT_CONFIGURE+= -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
++QT_DEP_LIBS+=mysql_client
+ endif
+ ifeq ($(BR2_PACKAGE_QT_ODBC),y)
+ QT_CONFIGURE+= -qt-sql-odbc
diff --git a/patches/buildroot/2010.11/132-qt-full_integration_with_cross_compiling.patch b/patches/buildroot/2010.11/132-qt-full_integration_with_cross_compiling.patch
index 298e23f..967b3e9 100644
--- a/patches/buildroot/2010.11/132-qt-full_integration_with_cross_compiling.patch
+++ b/patches/buildroot/2010.11/132-qt-full_integration_with_cross_compiling.patch
@@ -5,7 +5,7 @@ Signed-off-by: Jérémie Scheer <jer...@ar...>
Index: buildroot/package/qt/Config.in
===================================================================
--- buildroot.orig/package/qt/Config.in 2010-11-08 10:24:59.000000000 +0100
-+++ buildroot/package/qt/Config.in 2011-01-03 11:00:22.000000000 +0100
++++ buildroot/package/qt/Config.in 2011-01-03 14:04:23.000000000 +0100
@@ -17,7 +17,12 @@
If unsure, say N.
@@ -23,8 +23,8 @@ Index: buildroot/package/qt/Config.in
Index: buildroot/package/qt/qt.mk
===================================================================
--- buildroot.orig/package/qt/qt.mk 2010-11-08 10:24:59.000000000 +0100
-+++ buildroot/package/qt/qt.mk 2011-01-03 11:03:20.000000000 +0100
-@@ -49,11 +49,17 @@
++++ buildroot/package/qt/qt.mk 2011-01-03 17:33:36.000000000 +0100
+@@ -49,10 +49,16 @@
endif
ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
@@ -33,24 +33,13 @@ Index: buildroot/package/qt/qt.mk
else
-QT_CONFIGURE+= -nomake examples -nomake demos
+QT_CONFIGURE+= -nomake demos
-+endif
+ endif
+ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
+QT_CONFIGURE+= -examplesdir $(TARGET_DIR)/usr/share/qt/examples
+else
+QT_CONFIGURE+= -nomake examples
- endif
-
++endif
+
+
# ensure glib is built first if enabled for Qt's glib support
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
- QT_DEP_LIBS+=libglib2
-@@ -279,8 +285,7 @@
- QT_CONFIGURE+= -qt-sql-ibase
- endif
- ifeq ($(BR2_PACKAGE_QT_MYSQL),y)
--QT_CONFIGURE+= -qt-sql-mysql -I $(STAGING_DIR)/usr/include/mysql -L $(STAGING_DIR)/usr/lib/mysql
--
-+QT_CONFIGURE+= -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
- QT_DEP_LIBS+=mysql_client
- endif
- ifeq ($(BR2_PACKAGE_QT_ODBC),y)
diff --git a/patches/buildroot/2010.11/141-qt-fix_mysql_module.patch b/patches/buildroot/2010.11/141-qt-fix_mysql_module.patch
new file mode 100644
index 0000000..487c9a4
--- /dev/null
+++ b/patches/buildroot/2010.11/141-qt-fix_mysql_module.patch
@@ -0,0 +1,19 @@
+Fix Qt configuration options for MySQL module ; Specifies the MySQL's libraries and headers directories.
+
+Signed-off-by: Jérémie Scheer <jer...@ar...>
+
+===================================================================
+diff --git a/package/qt/qt.mk b/package/qt/qt.mk
+index 2b5b31b..6eb31bc 100644
+--- a/package/qt/qt.mk
++++ b/package/qt/qt.mk
+@@ -283,8 +283,7 @@ ifeq ($(BR2_PACKAGE_QT_IBASE),y)
+ QT_CONFIGURE+= -qt-sql-ibase
+ endif
+ ifeq ($(BR2_PACKAGE_QT_MYSQL),y)
+-QT_CONFIGURE+= -qt-sql-mysql -I $(STAGING_DIR)/usr/include/mysql -L $(STAGING_DIR)/usr/lib/mysql
+-
++QT_CONFIGURE+= -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
+ QT_DEP_LIBS+=mysql_client
+ endif
+ ifeq ($(BR2_PACKAGE_QT_ODBC),y)
hooks/post-receive
--
armadeus
|
