From 0b2a2d5d8e63c3f8e7f84395ed871b752e37590c Mon Sep 17 00:00:00 2001 From: Peter Michael Green Date: Sat, 29 Jul 2017 09:13:31 +0000 Subject: [PATCH] Remove install target fixup. It seems that said fixup breaks the build and is no longer needed. --- debian/changelog | 2 -- debian/rules | 8 -------- 2 files changed, 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6cdaf2cf12..d4497f4818 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,6 @@ rustc (1.17.0+dfsg2-8+rpi1) buster-staging; urgency=medium [changes brought forward from 1.15.1+dfsg1-1~exp3+rpi1 by Peter Michael Green at Wed, 15 Mar 2017 10:16:18 +0000] * Fix clean target. * Build for armv6. - * Manually fixup "install" step so that only armv6 stuff ends up - in the resulting packages. -- Raspbian forward porter Fri, 28 Jul 2017 13:32:44 +0000 diff --git a/debian/rules b/debian/rules index 0378550867..25b2066d04 100755 --- a/debian/rules +++ b/debian/rules @@ -186,14 +186,6 @@ endif override_dh_auto_install: DESTDIR=$(DEB_DESTDIR) $(RUSTBUILD) dist $(RUSTBUILD_FLAGS) --install - #upstream build produces both armv6 and armv7 stuff and installs a - #mixture of both. Fix things up so that only the armv6 stuff ends up - #in the packages. - cp arm-unknown-linux-gnueabihf/stage2/bin/rustc debian/tmp/usr/bin/ - cp arm-unknown-linux-gnueabihf/stage2/bin/rustdoc debian/tmp/usr/bin/ - cp arm-unknown-linux-gnueabihf/stage2/lib/*.so debian/tmp/usr/lib/ - rm -rf debian/tmp/usr/lib/rustlib/*armv7-unknown-linux-gnueabihf - mkdir -p $(DEB_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/ mv $(DEB_DESTDIR)/usr/lib/lib*.so $(DEB_DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/ -- 2.30.2