Package: debianutils
Version: 2.17.4
Tags: patch

Hi,

While we were starting the armel port, I found that debianutils would
have problems when cross built, or when built for stuff with a
different ABI, like with the armel triplet arm-linux-gnueabi. Attached
is a patch that should solve this.

regards,
guillem
--- debian/rules	2006-12-02 22:56:07.000000000 +0200
+++ debian/rules	2007-01-16 20:56:53.000000000 +0200
@@ -10,7 +10,6 @@ INSTALL_SCRIPT  = $(INSTALL) -p    -o ro
 INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
 
 DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
 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))
@@ -69,10 +68,10 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_
 	   	debian/tmp/bin/tempfile
 endif
 
-ifneq ($(DEB_BUILD_GNU_SYSTEM),gnu)
+ifneq ($(DEB_HOST_ARCH_OS),hurd)
 	ln -s /bin/which debian/tmp/usr/bin/which
 endif
-ifeq ($(DEB_BUILD_ARCH_OS),linux)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
 	mv debian/tmp/usr/sbin/installkernel debian/tmp/sbin/
 else
 	rm debian/tmp/usr/sbin/installkernel \

Reply via email to