[Buildroot] [pull request] Pull request for branch for-2011.02/fix-bug-2371

[Buildroot] [pull request] Pull request for branch for-2011.02/fix-bug-2371

[Thomas Petazzoni]

The following changes since commit 11ab05f53a16f635a27139b33170a9dadba9f3c5:
  Peter Korsgaard (1):
        qt: svg and multimedia modules depends on gui module as well

are available in the git repository at:

  git://git.busybox.net/~tpetazzoni/git/buildroot for-2011.02/fix-bug-2371

Thomas Petazzoni (2):
      mysql_client: bump to 5.1.53 to fix abi check problem
      qt: fix bug 2371

 ...ch => mysql_client-5.1.53-ac_cache_check.patch} |   17 ++++++++++-----
 ...l_client-5.1.53-configure-ps-cache-check.patch} |   22 +++++++++++--------
 ...sql_client-5.1.53-use-new-readline-iface.patch} |   12 +++++++---
 package/mysql_client/mysql_client.mk               |    2 +-
 package/qt/qt.mk                                   |    3 +-
 5 files changed, 34 insertions(+), 22 deletions(-)
 rename package/mysql_client/{mysql_client-5.1.47-ac_cache_check.patch => mysql_client-5.1.53-ac_cache_check.patch} (91%)
 rename package/mysql_client/{mysql_client-5.1.47-configure-ps-cache-check.patch => mysql_client-5.1.53-configure-ps-cache-check.patch} (57%)
 rename package/mysql_client/{mysql_client-5.1.47-use-new-readline-iface.patch => mysql_client-5.1.53-use-new-readline-iface.patch} (70%)

Thanks,
-- 
Thomas Petazzoni

[Buildroot] [PATCH 1/2] mysql_client: bump to 5.1.53 to fix abi check problem

[Thomas Petazzoni]

MySQL 5.1.47 is affected by a bug in one test called the "ABI check",
which does not work with recent gcc versions. This bug is referenced
as http://bugs.mysql.com/bug.php?id=52514 in MySQL bug tracker.

Since it has been fixed in newer versions of MySQL, we simply bump the
version to the latest available in the 5.1.x series.

The patches have not changed, they have only been refreshed.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...ch => mysql_client-5.1.53-ac_cache_check.patch} |   17 ++++++++++-----
 ...l_client-5.1.53-configure-ps-cache-check.patch} |   22 +++++++++++--------
 ...sql_client-5.1.53-use-new-readline-iface.patch} |   12 +++++++---
 package/mysql_client/mysql_client.mk               |    2 +-
 4 files changed, 33 insertions(+), 20 deletions(-)
 rename package/mysql_client/{mysql_client-5.1.47-ac_cache_check.patch => mysql_client-5.1.53-ac_cache_check.patch} (91%)
 rename package/mysql_client/{mysql_client-5.1.47-configure-ps-cache-check.patch => mysql_client-5.1.53-configure-ps-cache-check.patch} (57%)
 rename package/mysql_client/{mysql_client-5.1.47-use-new-readline-iface.patch => mysql_client-5.1.53-use-new-readline-iface.patch} (70%)

diff --git a/package/mysql_client/mysql_client-5.1.47-ac_cache_check.patch b/package/mysql_client/mysql_client-5.1.53-ac_cache_check.patch
similarity index 91%
rename from package/mysql_client/mysql_client-5.1.47-ac_cache_check.patch
rename to package/mysql_client/mysql_client-5.1.53-ac_cache_check.patch
index 6bdfeae..c3b55ba 100644
--- a/package/mysql_client/mysql_client-5.1.47-ac_cache_check.patch
+++ b/package/mysql_client/mysql_client-5.1.53-ac_cache_check.patch
@@ -6,9 +6,14 @@ cannot be performed when cross-compiling.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-diff -Naur mysql-5.1.47-old/storage/innodb_plugin/plug.in mysql-5.1.47-new/storage/innodb_plugin/plug.in
---- mysql-5.1.47-old/storage/innodb_plugin/plug.in	2010-05-20 09:55:10.000000000 -0700
-+++ mysql-5.1.47-new/storage/innodb_plugin/plug.in	2010-05-20 09:56:12.000000000 -0700
+---
+ storage/innodb_plugin/plug.in |   59 ++++++++++++++++++++++++++++--------------
+ 1 file changed, 40 insertions(+), 19 deletions(-)
+
+Index: mysql-5.1.53/storage/innodb_plugin/plug.in
+===================================================================
+--- mysql-5.1.53.orig/storage/innodb_plugin/plug.in
++++ mysql-5.1.53/storage/innodb_plugin/plug.in
 @@ -53,9 +53,10 @@
    esac
    AC_SUBST(INNODB_DYNAMIC_CFLAGS)
@@ -73,7 +78,7 @@ diff -Naur mysql-5.1.47-old/storage/innodb_plugin/plug.in mysql-5.1.47-new/stora
  
    AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
    # either define HAVE_IB_SOLARIS_ATOMICS or not
-@@ -147,9 +157,10 @@
+@@ -148,9 +158,10 @@
  			    are available])
    )
  
@@ -86,7 +91,7 @@ diff -Naur mysql-5.1.47-old/storage/innodb_plugin/plug.in mysql-5.1.47-new/stora
      [
        #include <pthread.h>
        #include <string.h>
-@@ -180,28 +191,33 @@
+@@ -181,28 +192,33 @@
        }
      ],
      [
@@ -125,7 +130,7 @@ diff -Naur mysql-5.1.47-old/storage/innodb_plugin/plug.in mysql-5.1.47-new/stora
      [
        int main() {
          __asm__ __volatile__ ("pause");
-@@ -209,16 +225,21 @@
+@@ -210,16 +226,21 @@
        }
      ],
      [
diff --git a/package/mysql_client/mysql_client-5.1.47-configure-ps-cache-check.patch b/package/mysql_client/mysql_client-5.1.53-configure-ps-cache-check.patch
similarity index 57%
rename from package/mysql_client/mysql_client-5.1.47-configure-ps-cache-check.patch
rename to package/mysql_client/mysql_client-5.1.53-configure-ps-cache-check.patch
index d7bf628..336e80e 100644
--- a/package/mysql_client/mysql_client-5.1.47-configure-ps-cache-check.patch
+++ b/package/mysql_client/mysql_client-5.1.53-configure-ps-cache-check.patch
@@ -6,23 +6,27 @@ the target to find the PID of a program.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-Index: mysql-4.1.22/configure.in
+---
+ configure.in |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+Index: mysql-5.1.53/configure.in
 ===================================================================
---- mysql-4.1.22.orig/configure.in	2009-01-28 16:33:28.000000000 +0000
-+++ mysql-4.1.22/configure.in	2009-01-28 16:43:26.000000000 +0000
-@@ -471,8 +471,8 @@
- 
- # Lock for PS
+--- mysql-5.1.53.orig/configure.in
++++ mysql-5.1.53/configure.in
+@@ -462,8 +462,8 @@
+ # then Make, then shell.  The autoconf substitution uses single quotes, so 
+ # no unprotected single quotes should appear in the expression.
  AC_PATH_PROG(PS, ps, ps)
 -AC_MSG_CHECKING("how to check if pid exists")
 -PS=$ac_cv_path_PS
 +AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC],
 +[
  # Linux style
- if $PS p $$ 2> /dev/null | grep $0 > /dev/null
+ if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
  then
-@@ -511,8 +511,9 @@
-       AC_MSG_ERROR([Could not find the right ps switches. Which OS is this ?. See the Installation chapter in the Reference Manual.])
+@@ -502,8 +502,9 @@
+       AC_MSG_ERROR([Could not find the right ps and/or grep switches. Which OS is this?  See the Installation chapter in the Reference Manual.])
    esac
  fi
 -AC_SUBST(FIND_PROC)
diff --git a/package/mysql_client/mysql_client-5.1.47-use-new-readline-iface.patch b/package/mysql_client/mysql_client-5.1.53-use-new-readline-iface.patch
similarity index 70%
rename from package/mysql_client/mysql_client-5.1.47-use-new-readline-iface.patch
rename to package/mysql_client/mysql_client-5.1.53-use-new-readline-iface.patch
index 34bc035..c590656 100644
--- a/package/mysql_client/mysql_client-5.1.47-use-new-readline-iface.patch
+++ b/package/mysql_client/mysql_client-5.1.53-use-new-readline-iface.patch
@@ -3,11 +3,15 @@ readline is being used.
 
 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 
-Index: mysql_client-5.1.47/configure.in
+---
+ configure.in |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: mysql-5.1.53/configure.in
 ===================================================================
---- mysql_client-5.1.47.orig/configure.in	2010-07-15 23:49:35.000000000 +0200
-+++ mysql_client-5.1.47/configure.in	2010-07-15 23:50:03.000000000 +0200
-@@ -2700,6 +2700,7 @@
+--- mysql-5.1.53.orig/configure.in
++++ mysql-5.1.53/configure.in
+@@ -2689,6 +2689,7 @@
  	    # this way we avoid linking commercial source with GPL readline
  	    readline_link="-lreadline"
  	    want_to_use_readline="yes"
diff --git a/package/mysql_client/mysql_client.mk b/package/mysql_client/mysql_client.mk
index 6a89a52..ccf7a2c 100644
--- a/package/mysql_client/mysql_client.mk
+++ b/package/mysql_client/mysql_client.mk
@@ -3,7 +3,7 @@
 # MySQL 5.1 Client
 #
 #############################################################
-MYSQL_CLIENT_VERSION = 5.1.47
+MYSQL_CLIENT_VERSION = 5.1.53
 MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
 MYSQL_CLIENT_SITE = http://downloads.mysql.com/archives/mysql-5.1/
 MYSQL_CLIENT_INSTALL_TARGET = YES
-- 
1.7.0.4

[Buildroot] [PATCH 2/2] qt: fix bug 2371

[Thomas Petazzoni]

Bug 2371 was a Qt compilation issue when MySQL support was enabled,
because the Qt configuration tests were looking at host MySQL
libraries.

Even though I couldn't reproduce the bug with MySQL libraries
installed on my host, there was clearly a problem since
-I/usr/include/mysql and -L/usr/lib/mysql were part of the compilation
flags when building those tests.

This was caused by the fact that /usr/bin/mysql_config was used
instead of $(STAGING_DIR)/usr/bin/mysql_config. We fix this by passing
the path to the correct mysql_config script using the -mysql_config Qt
./configure argument. Since this mysql_config script returns the
correct flags for libraries and headers path, the hardcoded -I and -L
flag in qt.mk are no longer needed.

With this in place, Qt is no longer compiled with -I/usr/include/mysql
and -L/usr/lib/mysql, which presumably should fix the problem reported
in bug 2371.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/qt/qt.mk |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

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)
-- 
1.7.0.4

[Buildroot] [pull request] Pull request for branch for-2011.02/fix-bug-2371

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> The following changes since commit 11ab05f53a16f635a27139b33170a9dadba9f3c5:
 Thomas>   Peter Korsgaard (1):
 Thomas>         qt: svg and multimedia modules depends on gui module as well

 Thomas> are available in the git repository at:

 Thomas>   git://git.busybox.net/~tpetazzoni/git/buildroot for-2011.02/fix-bug-2371

Committed, thanks.

-- 
Bye, Peter Korsgaard