Remove install target fixup. It seems that said fixup breaks the build and is

no longer needed.

diff --git a/debian/changelog b/debian/changelog
index 6cdaf2cf12232e9a0b09689a5075d2ae35e703f6..d4497f4818543d5d21d7d222358bc1e398f7e828 100644 (file)
--- 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 <plugwash@raspbian.org> 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 <root@raspbian.org>  Fri, 28 Jul 2017 13:32:44 +0000
 

diff --git a/debian/rules b/debian/rules
index 0378550867a8466be5da8ea45e3af5d4ea7b1727..25b2066d047e5c712fff3907eff4487f20cb0b5e 100755 (executable)
--- 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)/