Re: simplifying rebootstrap - breaking hurd bootstrap?
Hello,
Helmut Grohne, le lun. 06 avril 2020 11:58:53 +0200, a ecrit:
> I see an unpack error for hurd-headers-dev which ships
> /usr/include/sys/procfs.h without declaring a conflict with
> libc6-dev-i386.
FI, I have committed the attached patch to move sys/ files to multiarch
places. That shoud be enough to avoid most conflicts. Moving other
headers from hurd-dev will need the next version of glibc (2.30-5) in
which I made debian/sysdeps/hurd.mk symlink from multiarch places when
they are there.
Samuel
commit 7ba4856aadfa0513af319f926a2866efce4b3ae7
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat Apr 11 23:07:46 2020 +0000
debian/hurd-dev.install.in: Install sys/ headers in multiarch directory
to avoid sys/procfs.h conflict with libc linux headers. Also move ddekit
headers there. Ideally we will move all other hurd headers too, but that
will need glibc >= 2.30-5.
diff --git a/debian/changelog b/debian/changelog
index dd3e60801..9c163139c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
hurd (1:0.9.git20200330-2) UNRELEASED; urgency=medium
* patches/no-common: Fix build with gcc-10 (Closes: Bug#955447).
+ * debian/rules: Pass includedir=/usr/include.
+ * debian/hurd-dev.install.in: Install sys/ headers in multiarch directory,
+ to avoid sys/procfs.h conflict with libc linux headers. Also move ddekit
+ headers there. Ideally we will move all other hurd headers too, but that
+ will need glibc >= 2.30-5.
-- Samuel Thibault <sthibault@debian.org> Tue, 31 Mar 2020 20:41:42 +0000
diff --git a/debian/hurd-dev.install.in b/debian/hurd-dev.install.in
index a8bb13efe..73dbd512f 100755
--- a/debian/hurd-dev.install.in
+++ b/debian/hurd-dev.install.in
@@ -3,10 +3,13 @@
<!stage3> ../../libdde-linux26/lib/src/libdde_*.a usr/lib/@DEB_HOST_MULTIARCH@
<!stage3> ../../libdde-linux26/mk usr/share/libdde_linux26
<!stage3> usr/share/libdde_linux26/build usr/share/libdde_linux26
-../local/cdrom.h usr/include/sys
-../local/soundcard.h usr/include/sys
+../local/cdrom.h usr/include/@DEB_HOST_MULTIARCH@/sys
+../local/soundcard.h usr/include/@DEB_HOST_MULTIARCH@/sys
bin/fstests
bin/timertest
-include/* usr/include
+usr/include/sys usr/include/@DEB_HOST_MULTIARCH@
+usr/include/*.h usr/include
+usr/include/hurd usr/include
+usr/include/ddekit usr/include/@DEB_HOST_MULTIARCH@
lib/@DEB_HOST_MULTIARCH@/*.a
lib/@DEB_HOST_MULTIARCH@/*.so
diff --git a/debian/rules b/debian/rules
index 37490c81d..afff4e3ee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,7 @@ export YACC=:
export MIG=:
endif
endif
-CONFIGURE_ARGS += prefix=/ libdir=/lib/$(DEB_HOST_MULTIARCH) libexecdir=/lib/hurd datarootdir=/usr/share sysconfdir=/etc localstatedir=/var
+CONFIGURE_ARGS += prefix=/ includedir=/usr/include libdir=/lib/$(DEB_HOST_MULTIARCH) libexecdir=/lib/hurd datarootdir=/usr/share sysconfdir=/etc localstatedir=/var
CONFIGURE_ARGS_deb =
CONFIGURE_ARGS_udeb = libdir=/lib --without-libdaemon --without-libbz2
SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd
Reply to: