Merge lp:~peter-pearse/ubuntu/natty/db4.8/prop001 into lp:ubuntu/natty/db4.8

[Peter Pearse]

debian/rules changed:
- Test for java native bindings needs to test DEB_HOST_*, not DEB_BUILD_* against the lists.
- objcopy & strip need to be target host tools.
- Need to pass correct tools to configure.

Note: some packages had to be cross black-listed in xdeb.cfg.

[Steve Langasek (vorlon)]

+ CONFIGURE_VARS = CC=$(DEB_HOST_GNU_TYPE)-gcc CXX=$(DEB_HOST_GNU_TYPE)-g++ CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/$(DEB_HOST_GNU_TYPE)/usr/include/tcl8.5"

This path looks wrong. Shouldn't this be CPPFLAGS="-I/usr/$(DEB_HOST_GNU_TYPE)/include/tcl8.5"? Does something need to be fixed in the tcl8.5 crossing so that this installs to the right place?

Everything else looks spot-on!

review: Needs Fixing

[Steve Langasek (vorlon)]

(oh, please also fix debian/changelog to point to natty, not maverick)

[Steve Langasek (vorlon)]

crossing tcl8.5-dev, I see headers installed to /usr/arm-linux-gnueabi/include/tcl8.5/, so I'm pretty sure this just needs fixed here in the db4.8 patch.

[Peter Pearse (peter-pearse)]

CPPFLAGS corrected, distribution changed to natty.
Re-proposed.

[Steve Langasek (vorlon)]

found one more instance of DEB_BUILD that needed to be corrected to DEB_HOST; and the --with-tcl arg also needed to be corrected to point to the cross-build directory. Your changes were correct if insufficient, so I'll merge these; please have a look at the result in lp:ubuntu/db4.8 afterwards to see the further changes I've made.

review: Approve

[lp:~peter-pearse/ubuntu/natty/db4.8/prop001]

7. By Steve Langasek on 2011-02-01

Merge from Peter Pearse to fix cross-building

8. By Steve Langasek on 2011-02-01

fix maintainer field

9. By Steve Langasek on 2011-02-01

correct one more occurrence of DEB_BUILD vars where DEB_HOST should be used

10. By Steve Langasek on 2011-02-01

set the tcl path correctly on cross-compile

11. By Clint Adams on 2011-02-11

Orphan the package.

12. By Colin Watson on 2011-03-04

Build with -mno-vsx on ppc64, otherwise the tests fail.

13. By Colin Watson on 2011-03-04

set Maintainer for Ubuntu

14. By Colin Watson on 2011-03-04

releasing version 4.8.30-5ubuntu1

15. By Steve Langasek on 2011-03-17

build for multiarch

16. By Steve Langasek on 2011-03-17

bump dpkg-dev build-dependency for the final multiarch version in Ubuntu

17. By Steve Langasek on 2011-03-17

releasing version 4.8.30-5ubuntu2

18. By Peter Pearse on 2011-04-05

No java for cross builds.

Unmerged revisions

18. By Peter Pearse on 2011-04-05

No java for cross builds.

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-25 12:20:41 +0000
+++ debian/changelog	2011-01-31 13:13:14 +0000
@@ -1,3 +1,19 @@
+db4.8 (4.8.30-3ubuntu2) natty; urgency=low
+
+  * Correct CPPFLAGS for cross build
+  * Change distribution to natty
+
+ -- Peter Pearse <[e-mail]>  Mon, 31 Jan 2011 13:08:05 +0000
+
+db4.8 (4.8.30-3ubuntu1) maverick; urgency=low
+
+  * Enable both native & cross building by using DEB_HOST variables,
+    rather than DEB_BUILD ones.
+  * Pass correct values to configure for cross building
+  * Use correct binutils for cross building
+
+ -- Peter Pearse <[e-mail]>  Thu, 27 Jan 2011 14:00:03 +0000
+
 db4.8 (4.8.30-3) unstable; urgency=low
 
   * Patch from Matthias Klose to work around newer binutils breakage on
 
=== modified file 'debian/rules'
--- debian/rules	2010-04-04 09:07:08 +0000
+++ debian/rules	2011-01-31 13:13:14 +0000
@@ -20,6 +20,7 @@
 DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
 DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -28,7 +29,12 @@
 JAVA_UNSUPPORTED_SYSTEMS = zgnuz zknetbsd-gnuz
 -include /usr/share/gcj/debian_defaults
 
-CONFIGURE_VARS = CC=gcc CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/include/tcl8.5" 
+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+        CONFIGURE_VARS = CC=gcc CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/include/tcl8.5" 
+else
+        CONFIGURE_VARS = CC=$(DEB_HOST_GNU_TYPE)-gcc CXX=$(DEB_HOST_GNU_TYPE)-g++ CFLAGS="$(CFLAGS)" CPPFLAGS="-I/usr/$(DEB_HOST_GNU_TYPE)/include/tcl8.5"
+endif
+
 CONFIGURE_SWITCHES =    --prefix=/usr \
 			--mandir=\$${prefix}/share/man \
 			--localstatedir=/var \
@@ -46,6 +52,15 @@
 CONFIGURE_SWITCHES += --with-mutex=POSIX/pthreads/library
 endif
 
+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+        STRIP = strip
+        OBJCOPY = objcopy
+else
+        STRIP = $(DEB_HOST_GNU_TYPE)-strip
+        OBJCOPY = $(DEB_HOST_GNU_TYPE)-objcopy
+        CONFIGURE_SWITCHES += --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) 
+endif
+
 ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
 ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
 JAVA_HOME = /usr/lib/jvm/default-java
@@ -156,16 +171,16 @@
 			debian/lib$(package)-java-dev/usr/lib \
 			debian/lib$(package)-dbg/usr/lib/debug/usr/lib
 
-	objcopy --only-keep-debug debian/tmp/usr/lib/libdb-$(bdbversion).so \
+	$(OBJCOPY) --only-keep-debug debian/tmp/usr/lib/libdb-$(bdbversion).so \
                                   debian/lib$(package)-dbg/usr/lib/debug/usr/lib/libdb-$(bdbversion).so.debug
 
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	strip --remove-section=.note --remove-section=.comment \
+	$(STRIP) --remove-section=.note --remove-section=.comment \
 	      debian/tmp/usr/lib/*.so debian/tmp/usr/bin/*
-	strip --strip-debug debian/tmp/usr/lib/*.a
+	$(STRIP) --strip-debug debian/tmp/usr/lib/*.a
 endif
 
-	objcopy --add-gnu-debuglink=debian/lib$(package)-dbg/usr/lib/debug/usr/lib/libdb-$(bdbversion).so.debug \
+	$(OBJCOPY) --add-gnu-debuglink=debian/lib$(package)-dbg/usr/lib/debug/usr/lib/libdb-$(bdbversion).so.debug \
 				debian/tmp/usr/lib/libdb-$(bdbversion).so
 
 	chmod 644 debian/tmp/usr/lib/*.so debian/tmp/usr/include/*.h
@@ -175,13 +190,13 @@
 	cp -a debian/tmp/usr/bin debian/$(package)-util/usr
 	cp -a debian/tmp/usr/lib/*.so debian/tmp/usr/lib/*.a \
 	        debian/tmp/usr/lib/*.la debian/lib$(package)-dev/usr/lib
-ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
-ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
+ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
+ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
 	cp -a debian/tmp/usr/lib/db.jar \
 		debian/lib$(package)-java/usr/share/java/lib$(package)-java-$(version).jar
 	ln -s lib$(package)-java-$(version).jar \
 		debian/lib$(package)-java/usr/share/java/lib$(package)-java.jar
-ifneq (,$(filter $(DEB_BUILD_ARCH), $(gcj_native_archs)))
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
 	mkdir debian/lib$(package)-java-gcj
 	(TMPFILE=$$(mktemp --tmpdir sourcelist.XXXXXXXXXX) && \
 	find $(CURDIR) -type f ! -type l >$$TMPFILE && \
@@ -196,8 +211,8 @@
 	mv debian/lib$(package)-dev/usr/lib/*cxx* debian/lib$(package)++-dev/usr/lib
 	mv debian/lib$(package)-dev/usr/include/*cxx* debian/lib$(package)++-dev/usr/include
 	mv debian/lib$(package)-dev/usr/lib/*tcl* debian/lib$(package)-tcl/usr/lib
-ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
-ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
+ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
+ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
 	mv debian/lib$(package)-dev/usr/lib/*java* debian/lib$(package)-java/usr/lib
 
 	mv debian/lib$(package)-java/usr/lib/libdb*.a \
@@ -230,12 +245,12 @@
 	echo 'libdb $(bdbversion) lib$(package)' >debian/lib$(package)/DEBIAN/shlibs
 	echo 'libdb_cxx $(bdbversion) lib$(package)++' >debian/lib$(package)++/DEBIAN/shlibs
 	echo 'libdb_tcl $(bdbversion) lib$(package)-tcl' >debian/lib$(package)-tcl/DEBIAN/shlibs
-ifeq (,$(findstring z$(DEB_BUILD_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
-ifeq (,$(findstring z$(DEB_BUILD_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
+ifeq (,$(findstring z$(DEB_HOST_GNU_CPU)z,$(JAVA_UNSUPPORTED_CPUS)))
+ifeq (,$(findstring z$(DEB_HOST_GNU_SYSTEM)z,$(JAVA_UNSUPPORTED_SYSTEMS)))
 	echo 'libdb_java $(bdbversion) lib$(package)-java' >debian/lib$(package)-java/DEBIAN/shlibs
 	$(INSTALL_SCRIPT) debian/libjava.postinst debian/lib$(package)-java/DEBIAN/postinst
 
-ifneq (,$(filter $(DEB_BUILD_ARCH), $(gcj_native_archs)))
+ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
 	$(INSTALL_SCRIPT) debian/java-gcj.postrm debian/lib$(package)-java-gcj/DEBIAN/postrm
 	$(INSTALL_SCRIPT) debian/java-gcj.postinst debian/lib$(package)-java-gcj/DEBIAN/postinst
 endif