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

[Peter Pearse]

Unmerged revisions

13. By Peter Pearse on 2011-04-08

Cross building fix.

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-07 01:07:57 +0000
+++ debian/changelog	2011-04-08 14:45:51 +0000
@@ -1,3 +1,9 @@
+sqlite (2.8.17-6build2ubuntu1) natty; urgency=low
+
+  * Cross building fix
+
+ -- Peter Pearse <[e-mail]>  Fri, 08 Apr 2011 12:39:10 +0000
+
 sqlite (2.8.17-6build2) lucid; urgency=low
 
   * rebuild rest of main for armel armv7/thumb2 optimization;

=== modified file 'debian/rules'
--- debian/rules	2009-09-03 18:30:44 +0000
+++ debian/rules	2011-04-08 14:45:51 +0000
@@ -23,11 +23,21 @@
 DEB_AUTO_UPDATE_ACLOCAL = 1.9
 DEB_AUTO_UPDATE_AUTOMAKE = 1.9 # We don't use automake, but aclocal
 
-DEB_CONFIGURE_EXTRA_FLAGS = config_TARGET_TCL_INC="-I/usr/include/tcl8.4" \
+DEB_CONFIGURE_EXTRA_FLAGS = \
 			    config_BUILD_CFLAGS="$(CFLAGS) -DTHREADSAFE=1" \
 			    config_TARGET_LIBS="-lpthread" \
 			    --enable-utf8
 
+ifeq (yes,$(cdbs_crossbuild))
+        DEB_CONFIGURE_EXTRA_FLAGS += config_TARGET_TCL_INC="-I/usr/$(DEB_HOST_GNU_TYPE)/include/tcl8.4"
+        DEB_CONFIGURE_EXTRA_FLAGS += --host $(DEB_HOST_GNU_TYPE) --build $(DEB_BUILD_GNU_TYPE)
+        DEB_CONFIGURE_EXTRA_FLAGS += config_BUILD_CC=gcc
+        DEB_CONFIGURE_EXTRA_FLAGS += config_TARGET_CC=$(DEB_HOST_GNU_TYPE)-gcc
+        DEB_CONFIGURE_EXTRA_FLAGS += config_TARGET_READLINE_INC=-I/usr/$(DEB_HOST_GNU_TYPE)/include
+else
+        DEB_CONFIGURE_EXTRA_FLAGS += config_TARGET_TCL_INC="-I/usr/include/tcl8.4"
+endif
+
 DEB_BUILD_MAKE_TARGET = all libtclsqlite.la doc
 # DEB_MAKE_CHECK_TARGET = test