Merge lp:~peter-pearse/ubuntu/natty/mysql-5.1/prop001 into lp:ubuntu/natty/mysql-5.1

[Peter Pearse]

Patch debian/rules to
 * Build a complete host build for crosses - partial build would take longer to get correct
 * Pass directory for gen_lex_hash tool down to makes, allowing host binary to be used in crosses
 * Pass correct tools to configure

Added a code patch to
 * Patch Makefile.am to use passed gen_lex_hash directory
 * Patch storage/innodb_plugin/plug.in to allow dpkg-cross/cross-conf.armel overrides for some variables which cannot be determined during a cross.
 * Patch configure contain the resulting automake geneerated code.

[Steve Langasek (vorlon)]

Since gen_lex_hash is not installed in any package and is only used at build time, I think this should be fixed in the upstream rules to accept HOST_CC instead of rebuilding the entire package another time.

review: Needs Fixing

Unmerged revisions

25. By Peter Pearse on 2011-02-07

Patch for cross building

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-02 11:46:14 +0000
+++ debian/changelog	2011-02-07 17:39:12 +0000
@@ -1,3 +1,9 @@
+mysql-5.1 (5.1.54-1ubuntu5) maverick; urgency=low
+
+  * Patch for cross building
+
+ -- Peter Pearse <[e-mail]>  Mon, 07 Feb 2011 17:29:54 +0000
+
 mysql-5.1 (5.1.54-1ubuntu4) natty; urgency=low
 
   [Clint Byrum]

=== modified file 'debian/patches/00list'
--- debian/patches/00list	2011-01-26 09:19:25 +0000
+++ debian/patches/00list	2011-02-07 17:39:12 +0000
@@ -6,3 +6,4 @@
 41_scripts__mysql_install_db.sh__no_test.dpatch
 44_scripts__mysql_config__libs.dpatch
 50_mysql-test__db_test.dpatch
+60_cross.dpatch

=== added file 'debian/patches/60_cross.dpatch'
--- debian/patches/60_cross.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/60_cross.dpatch	2011-02-07 17:39:12 +0000
@@ -0,0 +1,314 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 60_cross.dpatch.dpatch by Peter Pearse <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch for cross building
+
+@DPATCH@
+
+diff -Nru mysql/60_cross.dpatch mysql_patched/60_cross.dpatch
+--- mysql/60_cross.dpatch	1970-01-01 00:00:00.000000000 +0000
++++ mysql_patched/60_cross.dpatch	2011-02-07 13:01:30.000000000 +0000
+@@ -0,0 +1,8 @@
++#! /bin/sh /usr/share/dpatch/dpatch-run
++## 60_cross.dpatch.dpatch by Peter Pearse <[e-mail]>
++##
++## All lines beginning with `## DP:' are a description of the patch.
++## DP: Pass tool location down for cross builds
++
++@DPATCH@
++
+diff -Nru mysql/configure mysql_patched/configure
+--- mysql/configure	2011-02-07 11:21:50.000000000 +0000
++++ mysql_patched/configure	2011-02-07 16:34:52.000000000 +0000
+@@ -47649,9 +47649,33 @@
+ 		;;
+   esac
+ 
+-
+   { $as_echo "$as_me:$LINENO: checking whether GCC atomic builtins are available" >&5
+ $as_echo_n "checking whether GCC atomic builtins are available... " >&6; }
++
++# Allow cache work round for cross compiling
++# storage/innodb_plugin/plug.in has been edited, 
++# but configure.ac not available 
++if test "${ac_cv_HAVE_IB_GCC_ATOMIC_BUILTINS+set}" = set; then
++        $as_echo_n "(cached) " >&6
++
++        if test "x$ac_cv_HAVE_IB_GCC_ATOMIC_BUILTINS" = xyes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define  HAVE_IB_GCC_ATOMIC_BUILTINS 1
++_ACEOF
++
++                { $as_echo "$as_me:$LINENO: result: yes" >&5
++                $as_echo "yes" >&6; }
++
++        else
++
++                { $as_echo "$as_me:$LINENO: result: no" >&5
++                $as_echo "no" >&6; }
++
++        fi
++
++else
++
+   # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
+   if test "$cross_compiling" = yes; then
+   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+@@ -47754,10 +47778,34 @@
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-
++fi
+ 
+   { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by GCC atomic builtins" >&5
+ $as_echo_n "checking whether pthread_t can be used by GCC atomic builtins... " >&6; }
++# Allow cache work round for cross compiling
++# storage/innodb_plugin/plug.in has been edited, 
++# but configure.ac not available 
++if test "${ac_cv_HAVE_IB_ATOMIC_PTHREAD_T_GCC+set}" = set; then
++        $as_echo_n "(cached) " >&6
++
++        if test "x$ac_cv_HAVE_IB_ATOMIC_PTHREAD_T_GCC" = xyes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define  HAVE_IB_ATOMIC_PTHREAD_T_GCC 1
++_ACEOF
++
++                { $as_echo "$as_me:$LINENO: result: yes" >&5
++                $as_echo "yes" >&6; }
++
++        else
++
++                { $as_echo "$as_me:$LINENO: result: no" >&5
++                $as_echo "no" >&6; }
++
++        fi
++
++else
++
+   # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
+   if test "$cross_compiling" = yes; then
+   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+@@ -47840,13 +47888,37 @@
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-
++fi
+ 
+   { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5
+ $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; }
+-  # either define HAVE_IB_SOLARIS_ATOMICS or not
+ 
++# Allow cache work round for cross compiling
++# storage/innodb_plugin/plug.in has been edited, 
++# but configure.ac not available 
++if test "${ac_cv_HAVE_IB_SOLARIS_ATOMICS+set}" = set; then
++        $as_echo_n "(cached) " >&6
+ 
++        if test "x$ac_cv_HAVE_IB_SOLARIS_ATOMICS" = xyes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define  HAVE_IB_SOLARIS_ATOMICS 1
++_ACEOF
++
++                { $as_echo "$as_me:$LINENO: result: yes" >&5
++                $as_echo "yes" >&6; }
++
++        else
++
++                { $as_echo "$as_me:$LINENO: result: no" >&5
++                $as_echo "no" >&6; }
++
++        fi
++
++else
++
++
++  # either define HAVE_IB_SOLARIS_ATOMICS or not
+ 
+ 
+ 
+@@ -48055,7 +48127,7 @@
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-
++fi
+ 
+   # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
+   # to use in the source
+@@ -48423,11 +48495,33 @@
+ #define SIZEOF_PTHREAD_T $ac_cv_sizeof_pthread_t
+ _ACEOF
+ 
+-
+-
+   # Check for x86 PAUSE instruction
+   { $as_echo "$as_me:$LINENO: checking for x86 PAUSE instruction" >&5
+ $as_echo_n "checking for x86 PAUSE instruction... " >&6; }
++# Allow cache work round for cross compiling
++# storage/innodb_plugin/plug.in has been edited, 
++# but configure.ac not available 
++if test "${ac_cv_HAVE_IB_PAUSE_INSTRUCTION+set}" = set; then
++        $as_echo_n "(cached) " >&6
++
++        if test "x$ac_cv_HAVE_IB_PAUSE_INSTRUCTION" = xyes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define  HAVE_IB_PAUSE_INSTRUCTION 1
++_ACEOF
++
++                { $as_echo "$as_me:$LINENO: result: yes" >&5
++                $as_echo "yes" >&6; }
++
++        else
++
++                { $as_echo "$as_me:$LINENO: result: no" >&5
++                $as_echo "no" >&6; }
++
++        fi
++
++else
++
+   # We have to actually try running the test program, because of a bug
+   # in Solaris on x86_64, where it wrongly reports that PAUSE is not
+   # supported when trying to run an application. See
+@@ -48500,7 +48594,7 @@
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-
++fi
+ 
+ 
+   fi
+diff -Nru mysql/sql/Makefile.am mysql_patched/sql/Makefile.am
+--- mysql/sql/Makefile.am	2011-02-07 11:21:53.000000000 +0000
++++ mysql_patched/sql/Makefile.am	2011-02-07 11:30:26.000000000 +0000
+@@ -173,9 +173,11 @@
+ # This generates lex_hash.h
+ # NOTE Built sources should depend on their sources not the tool
+ # this avoid the rebuild of the built files in a source dist
++# GEN_LEX_HASH_DIR may be used to locate host binary during cross builds
++GEN_LEX_HASH_DIR=.
+ lex_hash.h:	gen_lex_hash.cc lex.h
+ 		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+-		./gen_lex_hash$(EXEEXT) > $@-t
++		$(GEN_LEX_HASH_DIR)/gen_lex_hash$(EXEEXT) > $@-t
+ 		$(MV) $@-t $@
+ 
+ # For testing of udf_example.so
+diff -Nru mysql/sql/Makefile.in mysql_patched/sql/Makefile.in
+--- mysql/sql/Makefile.in	2011-02-07 11:21:53.000000000 +0000
++++ mysql_patched/sql/Makefile.in	2011-02-07 11:36:05.000000000 +0000
+@@ -1303,9 +1303,11 @@
+ # This generates lex_hash.h
+ # NOTE Built sources should depend on their sources not the tool
+ # this avoid the rebuild of the built files in a source dist
++# GEN_LEX_HASH_DIR may be used to locate host binary during cross builds
++GEN_LEX_HASH_DIR = .
+ lex_hash.h:	gen_lex_hash.cc lex.h
+ 		$(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT)
+-		./gen_lex_hash$(EXEEXT) > $@-t
++		$(GEN_LEX_HASH_DIR)/gen_lex_hash$(EXEEXT) > $@-t
+ 		$(MV) $@-t $@
+ 
+ # We might have some stuff not built in this build, but that we want to install
+diff -Nru mysql/storage/innodb_plugin/plug.in mysql_patched/storage/innodb_plugin/plug.in
+--- mysql/storage/innodb_plugin/plug.in	2011-02-07 11:21:53.000000000 +0000
++++ mysql_patched/storage/innodb_plugin/plug.in	2011-02-07 13:11:42.000000000 +0000
+@@ -53,8 +53,8 @@
+   esac
+   AC_SUBST(INNODB_DYNAMIC_CFLAGS)
+ 
+-  AC_MSG_CHECKING(whether GCC atomic builtins are available)
+-  # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
++  AC_CACHE_CHECK([whether GCC atomic builtins are available],
++      [ac_cv_HAVE_IB_GCC_ATOMIC_BUILTINS],[
+   AC_TRY_RUN(
+     [
+       int main()
+@@ -95,17 +95,23 @@
+       }
+     ],
+     [
+-      AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1],
+-                [GCC atomic builtins are available])
++      ac_cv_HAVE_IB_GCC_ATOMIC_BUILTINS=yes
+       AC_MSG_RESULT(yes)
+     ],
+     [
++      ac_cv_HAVE_IB_GCC_ATOMIC_BUILTINS=no
+       AC_MSG_RESULT(no)
+     ]
+   )
++  ])
++
++  if test x"$ac_cv_HAVE_IB_GCC_ATOMIC_BUILTINS" = "xyes" ; then
++      AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1],
++                [GCC atomic builtins are available])
++  fi  
+ 
+-  AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins)
+-  # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
++  AC_CACHE_CHECK([whether pthread_t can be used by GCC atomic builtins],
++      [ac_cv_HAVE_IB_ATOMIC_PTHREAD_T_GCC],[
+   AC_TRY_RUN(
+     [
+       #include <pthread.h>
+@@ -126,17 +132,23 @@
+       }
+     ],
+     [
+-      AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1],
+-                [pthread_t can be used by GCC atomic builtins])
++      ac_cv_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes
+       AC_MSG_RESULT(yes)
+     ],
+     [
++      ac_cv_HAVE_IB_ATOMIC_PTHREAD_T_GCC=no
+       AC_MSG_RESULT(no)
+     ]
+   )
++  ])
++
++  if test x"$ac_cv_HAVE_IB_ATOMIC_PTHREAD_T_GCC" = "xyes" ; then
++      AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1],
++                [pthread_t can be used by GCC atomic builtins])
++  fi
+ 
+-  AC_MSG_CHECKING(whether Solaris libc atomic functions are available)
+-  # either define HAVE_IB_SOLARIS_ATOMICS or not
++  AC_CACHE_CHECK([whether Solaris libc atomic functions are available],
++      [ac_cv_HAVE_IB_SOLARIS_ATOMICS],[
+   AC_CHECK_FUNCS(atomic_cas_ulong \
+ 		 atomic_cas_32 \
+ 		 atomic_cas_64 \
+@@ -189,13 +201,14 @@
+       AC_MSG_RESULT(no)
+     ]
+   )
++  ])
+ 
+   # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
+   # to use in the source
+   AC_CHECK_SIZEOF([pthread_t], [], [#include <pthread.h>])
+ 
+-  # Check for x86 PAUSE instruction
+-  AC_MSG_CHECKING(for x86 PAUSE instruction)
++  AC_CACHE_CHECK([for x86 PAUSE instruction],
++      [ac_cv_HAVE_IB_PAUSE_INSTRUCTION],[
+   # We have to actually try running the test program, because of a bug
+   # in Solaris on x86_64, where it wrongly reports that PAUSE is not
+   # supported when trying to run an application. See
+@@ -222,4 +235,6 @@
+   )
+   ])
+ 
++  ])
++
+ # vim: set ft=config:

=== modified file 'debian/rules'
--- debian/rules	2011-02-02 11:46:14 +0000
+++ debian/rules	2011-02-07 17:39:12 +0000
@@ -15,6 +15,16 @@
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
 
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+        export MYSQL_BUILD_CC=$(DEB_HOST_GNU_TYPE)-gcc
+        export MYSQL_BUILD_CXX=$(DEB_HOST_GNU_TYPE)-g++
+        DEB_BUILD_OPTIONS += nocheck
+        MAKE_ENV = GEN_LEX_HASH_DIR=../../$(BUILDDIR_HOST)/sql
+
+else
+        MAKE_ENV =
+endif
+
 DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
 DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-)
@@ -47,7 +57,12 @@
 
 BUILDDIR = builddir
 BUILDDIR_PIC = builddir-pic
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+BUILDDIR_HOST = builddir-host
+builddir = $(if $(findstring -pic,$@),$(BUILDDIR_PIC),$(if $(findstring -host,$@),$(BUILDDIR_HOST),$(BUILDDIR)))
+else
 builddir = $(if $(findstring -pic,$@),$(BUILDDIR_PIC),$(BUILDDIR))
+endif
 
 # This causes seg11 crashes if LDAP is used for groups in /etc/nsswitch.conf
 # so it is disabled by default although, according to MySQL, it brings >10%
@@ -62,7 +77,19 @@
 
 configure: patch configure-stamp
 configure-pic: patch configure-stamp-pic
+
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+
+configure-host: patch  configure-stamp-host
+
+configure-stamp-host: HOST_TYPE=$(DEB_BUILD_GNU_TYPE) CC=gcc CXX=g++
+configure-stamp:      HOST_TYPE=$(DEB_HOST_GNU_TYPE)  CC=$(DEB_HOST_GNU_TYPE)-gcc CXX=$(DEB_HOST_GNU_TYPE)-g++
+configure-stamp-pic:  HOST_TYPE=$(DEB_HOST_GNU_TYPE)  CC=$(DEB_HOST_GNU_TYPE)-gcc CXX=$(DEB_HOST_GNU_TYPE)-g++
+
+configure-stamp-host configure-stamp configure-stamp-pic:
+else
 configure-stamp configure-stamp-pic:
+endif
 	@echo "RULES.$@"
 	dh_testdir
 
@@ -78,7 +105,7 @@
 	    	CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O3 -DBIG_JOINS=1 -felide-constructors -fno-exceptions -fno-rtti ${FORCE_FPIC_CFLAGS} -fno-strict-aliasing"} \
 	    ../configure \
 		--build=${DEB_BUILD_GNU_TYPE} \
-		--host=${DEB_HOST_GNU_TYPE} \
+		--host=${HOST_TYPE} \
 		\
 		--prefix=/usr \
 	        --exec-prefix=/usr \
@@ -123,9 +150,23 @@
 	
 	touch $@
 
-
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+build: build-stamp-host build-stamp build-stamp-pic
+
+build-stamp-host: configure-host
+	@echo "RULES.$@"
+	dh_testdir
+	[ -f $(EXPORTED_SOURCE_TARBALL) ] || tar -zcf $(EXPORTED_SOURCE_TARBALL) \
+	--exclude=debian . \
+	--transform="s,^\./,mysql-5.1/,"
+
+	cd $(builddir) && $(MAKE) $(MAKE_J) $(MAKE_ENV)
+
+	@touch $@
+
+else
 build: build-stamp build-stamp-pic
-
+endif
 build-stamp: configure
 	@echo "RULES.$@"
 	dh_testdir
@@ -133,7 +174,7 @@
       --exclude=debian . \
       --transform="s,^\./,mysql-5.1/,"
 
-	cd $(builddir) && $(MAKE) $(MAKE_J)
+	cd $(builddir) && $(MAKE) $(MAKE_J) $(MAKE_ENV)
 
 ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
 	# Don't know why the following is necessary...
@@ -150,7 +191,7 @@
 
 	touch build-stamp
 
-MAKE_PIC = cd $(builddir) && $(MAKE) $(MAKE_J)
+MAKE_PIC = cd $(builddir) && $(MAKE) $(MAKE_J) $(MAKE_ENV)
 
 build-stamp-pic: configure-pic
 	@echo "RULES.$@"
@@ -187,7 +228,9 @@
 	[ ! -d mysql-test/var ] || rm -rf mysql-test/var
 	
 	rm -rf $(BUILDDIR) $(BUILDDIR_PIC)
-
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	rm -fr $(BUILDDIR_HOST)
+endif
 	debconf-updatepo
 	rm -f $(EXPORTED_SOURCE_TARBALL)
 	dh_clean -v