Re: Flatten sysdeps/unix/bsd/bsd4.4 into sysdeps/unix/bsd

[Thomas Schwinge <thomas at codesourcery dot com>]

Hi!

Sorry for the delay.


On Mon, 9 Jul 2012 08:42:54 -0700, Roland McGrath <roland@hack.frob.com> wrote:
> > Here then is the original patch without the sysdeps/mach/hurd/Implies 
> > changes.  I hope that the Implies mechanism works properly when a 
> > directory that does not exist is named (that is, produces the same 
> > directory ordering as if the directory did exist), since git does not 
> > represent empty directories so the effect of this patch is that the 
> > directory sysdeps/unix/bsd/bsd4.4 will not exist but will still be 
> > referenced by sysdeps/mach/hurd/Implies.
> 
> Off hand I think it will work, though configure will warn:
>     AC_MSG_WARN($name/$implies_file specifies nonexistent $x)
> But I think that is acceptable enough since we intend to clean up the
> situation further before the next release.
> 
> This change looks OK to me, but I think it should wait for Thomas to
> verify that it doesn't materially change the Hurd build.

No, this does not work.  The algorithm (as I understand it from quickly
looking) does not consider parent directories in the Ânonexistent ...Â
case, but we need that.  Here is a patch to add on top of Joseph's latest
patch, that I have now successfully tested.

I cannot claim I completely understand the sysdeps algorithm, but
parameterized as follows this at least does now create exactly the
sysdeps ordering we want: remove unix/bsd/bsd4.4 while leaving unix/bsd
where it was.  I also confirmed that the files moved from unix/bsd/bsd4.4
to unix/bsd are still preferred for example over their unix/posix
variants (the latter being after unix/bsd in the sysdeps list, so that is
fine).

	* sysdeps/mach/hurd/Implies: Remove unix/bsd/bsd4.4.
	* sysdeps/mach/hurd/Implies-after: Add unix/bsd.

diff --git a/sysdeps/mach/hurd/Implies b/sysdeps/mach/hurd/Implies
index b606346..6119243 100644
--- a/sysdeps/mach/hurd/Implies
+++ b/sysdeps/mach/hurd/Implies
@@ -1,5 +1,3 @@
 # The gnu subdirectory exists for things common to both Linux-based and
 # Hurd-based GNU systems.
 gnu
-# The Hurd provides a rough superset of the functionality of 4.4 BSD.
-unix/bsd/bsd4.4
diff --git a/sysdeps/mach/hurd/Implies-after b/sysdeps/mach/hurd/Implies-after
new file mode 100644
index 0000000..a35456f
--- /dev/null
+++ b/sysdeps/mach/hurd/Implies-after
@@ -0,0 +1,2 @@
+# The Hurd provides a rough superset of the functionality of BSD.
+unix/bsd


GrÃÃe,
 Thomas

Attachment: pgp00000.pgp
Description: PGP signature