Package: rsync
Version: 3.0.9-3
Severity: normal
Tags: patch
User: [email protected]
Usertags: cross
The rsync package almost cross-builds correctly, but fails because it
uses the wrong strip program. This patch corrects that.
* Use correct strip program when cross-building.
diff -u rsync-3.0.9/debian/rules rsync-3.0.9/debian/rules
--- rsync-3.0.9/debian/rules
+++ rsync-3.0.9/debian/rules
@@ -49,6 +49,12 @@
DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+INSTALL_CROSS :=
+else
+INSTALL_CROSS := INSTALLCMD='$(INSTALL)
--strip-program=$(DEB_HOST_GNU_TYPE)-strip'
+endif
+
# keep lintian happy:
build: build-arch build-indep
build-arch: build-stamp
@@ -93,7 +99,7 @@
debian/tmp/etc/init.d
# debian/tmp/usr/lib/debian-test/tests
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- $(MAKE) --directory=debian/buildtree install-strip
prefix=`pwd`/debian/tmp/usr exec_prefix=`pwd`/debian/tmp/usr
+ $(MAKE) --directory=debian/buildtree install-strip
prefix=`pwd`/debian/tmp/usr exec_prefix=`pwd`/debian/tmp/usr $(INSTALL_CROSS)
else
$(MAKE) --directory=debian/buildtree install
prefix=`pwd`/debian/tmp/usr exec_prefix=`pwd`/debian/tmp/usr
endif
Thanks,
--
Colin Watson [[email protected]]
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
