Bug#736750: gnutls26: Do not depend on p11-kit for OpenRISC. Do not use chrpath if cross compiling.

[Christian Svensson]

Package: gnutls26
Version: 2.12.23-8
Severity: normal
Tags: patch

Dear Maintainer,

OpenRISC does not have support for libffi and thus not p11-kit.
Do not require it to be present for or1k.

chrpath does not support OpenRISC ELFs and cannot be used to strip
binaries. Do not use chrpath if we are cross compiling.

*** gnutls26-cross.patch
diff -Nru gnutls26-2.12.23/debian/control gnutls26-2.12.23/debian/control
--- gnutls26-2.12.23/debian/control	2013-10-06 11:49:33.000000000 +0000
+++ gnutls26-2.12.23/debian/control	2014-01-26 12:20:10.000000000 +0000
@@ -9,7 +9,7 @@
 Build-Depends: debhelper (>= 9), libgcrypt11-dev (>= 1.4.0), zlib1g-dev,
  cdbs (>= 0.4.93), gtk-doc-tools, texinfo (>= 4.8),
  libtasn1-3-dev (>= 2.14-0), autotools-dev, datefudge,
- libp11-kit-dev (>= 0.11), pkg-config, chrpath
+ libp11-kit-dev (>= 0.11) [!or1k], pkg-config, chrpath
 Build-Conflicts: libgnutls-dev
 Standards-Version: 3.9.4
 #Vcs-Svn: svn://svn.debian.org/svn/pkg-gnutls/packages/gnutls26/trunk
@@ -25,7 +25,7 @@
 Depends: libgnutls26 (= ${binary:Version}), 
  libgnutlsxx27 (= ${binary:Version}),libgnutls-openssl27 (= ${binary:Version}),
  libgcrypt11-dev (>= 1.4.0), libc6-dev | libc-dev, zlib1g-dev,
- libtasn1-3-dev (>= 2.14-0), libp11-kit-dev (>= 0.4), ${misc:Depends}
+ libtasn1-3-dev (>= 2.14-0), libp11-kit-dev (>= 0.4) [!or1k], ${misc:Depends}
 Suggests: gnutls26-doc
 Conflicts: gnutls-dev
 Replaces: gnutls-dev
diff -Nru gnutls26-2.12.23/debian/rules gnutls26-2.12.23/debian/rules
--- gnutls26-2.12.23/debian/rules	2013-06-29 11:07:32.000000000 +0000
+++ gnutls26-2.12.23/debian/rules	2014-01-26 12:16:10.000000000 +0000
@@ -16,6 +16,16 @@
 DEB_DH_MAKESHLIBS_ARGS_libgnutlsxx27 := -V 'libgnutlsxx27 (>= 2.12.17-0)'
 DEB_COMPRESS_EXCLUDE := gnutls.pdf
 
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+# If the architecture does not have libffi then p11-kit will not be
+# available either.
+p11_no_cpus := or1k
+ifneq (,$(findstring $(DEB_HOST_ARCH_CPU),$(p11_no_cpus)))
+  DEB_CONFIGURE_EXTRA_FLAGS := $(DEB_CONFIGURE_EXTRA_FLAGS) --without-p11-kit
+endif
+
 # pre-clean rule: save gnutls.pdf since it is expensive to regenerate.
 # See README.source
 cleanbuilddir/gnutls26-doc::
@@ -39,10 +49,12 @@
 	$(MAKE) html
 
 common-install-arch::
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
 	find debian/tmp/usr/lib/* -name '*.so.*.*' -type f -exec \
 		chrpath -d {} +
 	find debian/tmp/usr/bin/ -type f -exec \
 		chrpath -d {} +
+endif
 	if ! test -e debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgnutls26 ; \
 		then \
 		install -d -m755 \


-- System Information:
Debian Release: 7.2
Architecture: amd64 (x86_64)
Foreign Architectures: or1k

Kernel: Linux 3.12-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash