Makefile, bin/chroot-maint: Keep `/usr/local/include' mostly empty.

[distorted-chroot] / bin / chroot-maint

diff --git a/bin/chroot-maint b/bin/chroot-maint
index 1d4a2a9..21e5c21 100755 (executable)
--- a/bin/chroot-maint
+++ b/bin/chroot-maint
@@ -2253,6 +2253,7 @@ exit 101
         apt-get -y dist-upgrade
         apt-get -y autoremove
         apt-get -y clean
+        ldconfig
       """], stdin = DISCARD)
       if arch in C.FOREIGN_ARCHS: me._install_cross_tools()
       me._meta.update = zulu(); me._meta.write()
@@ -2668,6 +2669,11 @@ class PackageBuildJob (BaseJob):
       run_schroot_session(session,
                           ["mount", "-oremount,rw", "/usr/local.schroot"],
                           rootp = True, stdin = DISCARD)
+      run_schroot_session(session,
+                          ["mount", "--bind",
+                           "/usr/local.schroot/%s/include.aside" % arch,
+                           "/usr/local.schroot/%s/include" % arch],
+                          rootp = True, stdin = DISCARD)
 
       progress("configure `%s' %s for %s" % (pkg, ver, arch))
       run_schroot_session(session, ["sh", "-e", "-c", """