[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-202-g11a2f51

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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  11a2f51b711f128402004086f2d7607225ca7046 (commit)
      from  da5448085049781ba34238a9fb6ee5052909f730 (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 11a2f51b711f128402004086f2d7607225ca7046
Author: Jeremie Scheer <jer...@ar...>
Date:   Mon Jan 3 14:21:54 2011 +0100

    [BUILDROOT] Correct Qt configuration options for MySQL module to specify libraries and headers directories.
    [BUILDROOT] Convert MySQL Makefile to old-style post-install hook : BR variables aren't recognized in new-style hooks.

-----------------------------------------------------------------------

Summary of changes:
 ...-qt-full_integration_with_cross_compiling.patch |   24 ++++++++++++-----
 ...061-mysql_client-reduce_installation_size.patch |   22 ++++++++++------
 ...-qt-full_integration_with_cross_compiling.patch |   27 ++++++++++++++------
 3 files changed, 50 insertions(+), 23 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 8b76ea6..cd89cd1 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-11 09:38:44.000000000 +0200
-+++ buildroot/package/qtopia4/Config.in	2010-10-11 09:49:36.000000000 +0200
+--- 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
 @@ -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-11 09:38:44.000000000 +0200
-+++ buildroot/package/qtopia4/qtopia4.mk	2010-10-11 16:36:12.000000000 +0200
+--- 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
 @@ -17,6 +17,7 @@
  QT_SITE:=http://get.qt.nokia.com/qt/source
  QT_CAT:=$(ZCAT)
@@ -34,7 +34,17 @@ Index: buildroot/package/qtopia4/qtopia4.mk
  
  QT_CONFIGURE:=#empty
  
-@@ -345,6 +346,14 @@
+@@ -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 @@
  QT_CONFIGURE+= -no-stl
  endif
  
@@ -49,7 +59,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 +492,11 @@
+@@ -483,11 +493,11 @@
  		-no-accessibility \
  		-no-separate-debug-info \
  		-prefix /usr \
@@ -63,7 +73,7 @@ Index: buildroot/package/qtopia4/qtopia4.mk
  	)
  	touch $@
  
-@@ -560,8 +569,19 @@
+@@ -560,8 +570,19 @@
  	cp -dpf $(STAGING_DIR)/usr/lib/libQtScriptTools.so.* $(TARGET_DIR)/usr/lib/
  endif
  
diff --git a/patches/buildroot/2010.11/061-mysql_client-reduce_installation_size.patch b/patches/buildroot/2010.11/061-mysql_client-reduce_installation_size.patch
index a12c71f..d6cacd9 100644
--- a/patches/buildroot/2010.11/061-mysql_client-reduce_installation_size.patch
+++ b/patches/buildroot/2010.11/061-mysql_client-reduce_installation_size.patch
@@ -5,8 +5,8 @@ Signed-off-by: Fabien Marteau <fab...@ar...>
 
 Index: buildroot/package/mysql_client/Config.in
 ===================================================================
---- buildroot.orig/package/mysql_client/Config.in	2010-10-18 23:01:17.000000000 +0200
-+++ buildroot/package/mysql_client/Config.in	2010-10-18 23:03:16.000000000 +0200
+--- buildroot.orig/package/mysql_client/Config.in	2011-01-03 14:00:29.000000000 +0100
++++ buildroot/package/mysql_client/Config.in	2011-01-03 14:00:39.000000000 +0100
 @@ -8,3 +8,20 @@
  
  comment "Mysql client requires a toolchain with C++ support enabled"
@@ -30,12 +30,16 @@ Index: buildroot/package/mysql_client/Config.in
 +endif
 Index: buildroot/package/mysql_client/mysql_client.mk
 ===================================================================
---- buildroot.orig/package/mysql_client/mysql_client.mk	2010-10-18 23:01:24.000000000 +0200
-+++ buildroot/package/mysql_client/mysql_client.mk	2010-10-18 23:04:49.000000000 +0200
-@@ -34,6 +34,17 @@
+--- buildroot.orig/package/mysql_client/mysql_client.mk	2011-01-03 14:00:29.000000000 +0100
++++ buildroot/package/mysql_client/mysql_client.mk	2011-01-03 14:02:16.000000000 +0100
+@@ -32,10 +32,20 @@
+ 	--enable-thread-safe-client \
+ 	$(ENABLE_DEBUG)
  
- define MYSQL_CLIENT_REMOVE_TEST_PROGS
+-define MYSQL_CLIENT_REMOVE_TEST_PROGS
++$(MYSQL_CLIENT_HOOK_POST_INSTALL):
  	rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench
+-endef
 +ifeq ($(BR2_PACKAGE_MYSQL_CLIENT_SHRINK),y)
 +	rm -rf $(TARGET_DIR)/usr/bin/mysql_client_test
 +	rm -rf $(TARGET_DIR)/usr/bin/mysql_waitpid
@@ -47,6 +51,8 @@ Index: buildroot/package/mysql_client/mysql_client.mk
 +	rm -rf $(TARGET_DIR)/usr/bin/myisamlog
 +	rm -rf $(TARGET_DIR)/usr/bin/my_print_defaults
 +endif
- endef
++
+ 
+-MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_REMOVE_TEST_PROGS
  
- MYSQL_CLIENT_POST_INSTALL_TARGET_HOOKS += MYSQL_CLIENT_REMOVE_TEST_PROGS
+ $(eval $(call AUTOTARGETS,package,mysql_client))
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 077eb7e..298e23f 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
@@ -4,8 +4,8 @@ Signed-off-by: JÃ©rÃ©mie Scheer <jer...@ar...>
 
 Index: buildroot/package/qt/Config.in
 ===================================================================
---- buildroot.orig/package/qt/Config.in	2010-10-19 14:08:55.000000000 +0200
-+++ buildroot/package/qt/Config.in	2010-10-19 14:11:11.000000000 +0200
+--- 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
 @@ -17,7 +17,12 @@
  	  If unsure, say N.
  
@@ -22,9 +22,9 @@ Index: buildroot/package/qt/Config.in
  
 Index: buildroot/package/qt/qt.mk
 ===================================================================
---- buildroot.orig/package/qt/qt.mk	2010-10-19 14:11:35.000000000 +0200
-+++ buildroot/package/qt/qt.mk	2010-10-19 15:02:41.000000000 +0200
-@@ -49,10 +49,16 @@
+--- 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 @@
  endif
  
  ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
@@ -33,13 +33,24 @@ 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)


hooks/post-receive
-- 
armadeus


