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

[Peter Pearse]

Needs to find libgpg-error using gpg-error-config mechanism

Unmerged revisions

30. By Peter Pearse on 2011-04-06

Adjust gpg-error paths for crossing.

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-22 19:45:07 +0000
+++ debian/changelog	2011-04-06 16:11:33 +0000
@@ -1,3 +1,9 @@
+libgcrypt11 (1.4.6-4ubuntu3) natty; urgency=low
+
+  * Adjust gpg-error paths for crossing
+
+ -- Peter Pearse <[e-mail]>  Wed, 06 Apr 2011 16:04:37 +0000
+
 libgcrypt11 (1.4.6-4ubuntu2) natty; urgency=low
 
   * Move libgcrypt.so into /usr/lib/$(DEB_HOST_MULTIARCH) where it belongs.

=== modified file 'debian/rules'
--- debian/rules	2011-03-22 19:42:11 +0000
+++ debian/rules	2011-04-06 16:11:33 +0000
@@ -1,6 +1,21 @@
 #! /usr/bin/make -f
 # Build the libgcrypt package for Debian.
 
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+
+        here = $(shell pwd)
+
+common-configure-impl::
+	@echo "Set up cross gpg-error-config before configure is called"
+	mkdir -p $(here)/bin
+	sed 's/\/lib\/.*linux-gnu/\/lib\/$(DEB_HOST_GNU_TYPE)/' /usr/bin/gpg-error-config > $(here)/bin/gpg-error-config
+	chmod a+x $(here)/bin/gpg-error-config
+	-ln -s /usr/$(DEB_HOST_GNU_TYPE)/lib/libgpg-error.so $(here)/libgpg-error.so
+
+endif
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
@@ -8,7 +23,9 @@
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-noexecstack \
 	--enable-ld-version-script --libdir=/lib/$(DEB_HOST_MULTIARCH)
 ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
-DEB_MAKE_CHECK_TARGET = check
+        DEB_MAKE_CHECK_TARGET = check
+else
+        DEB_CONFIGURE_EXTRA_FLAGS += --with-gpg-error-prefix=$(here)
 endif
 
 DEB_DH_STRIP_ARGS = --dbg-package=libgcrypt11-dbg
@@ -16,6 +33,9 @@
 	--add-udeb=libgcrypt11-udeb
 
 clean::
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	if [ -d ./bin ] ; then rm-fr ./bin ; fi
+endif
 	if test -f ltmain.sh ; then touch ltmain.sh; else libtoolize -c -f --automake; fi
 	if test -f aclocal.m4 ; then touch aclocal.m4; else aclocal-1.9 -I m4 ; fi
 	if test -f config.h.in ; then touch config.h.in; else autoheader2.50; fi