Patch: re-merge NetworkInterface

[David Daney]

Marco Trudel wrote:
> Tom Tromey wrote:
>>>>>>> "Marco" == Marco Trudel <mtrudel@gmx.ch> writes:
>>
>> Marco> No rule to make target
>> Marco> `/usr/local/src/gcc/libjava/java/net/NetworkInterface.java', 
>> needed by
>> Marco> `compile-classes'. Stop.
>>
>> Would you mind filing a bug for this build problem?
>
> I don't really understand the problem, so I can't fill a bug report 
> that makes sense. Is the problem that MulticastSocket.java and 
> NetworkInterface.java are empty instead of being deleted? So they will 
> be used instead the classpath ones but of course they do not contain a 
> class.
> How can a patch delete a file anyway?
> How can this work on Linux? This doesn't seem to be a mingw only 
> problem (but then again, I don't understand the real problem)
>
>
>> To fix, rm <build>/.../libjava/classpath/classes*
>
> I assume you mean "rm 
> <build>/i686-pc-mingw32/libjava/classpath/classes*". I have no files 
> and no folders named classes* in that directory.
>
Apply the patch.

configure ... --java-maintainer-mode

find libjava/classpath/lib -name \*.class -print | xargs rm

make


>
>> Then make.
>>
>> Marco> - gnu/java/net/PlainDatagramSocketImpl.java
>> Marco> still references NetworkInterface instead of VMNetworkInterface.
>>
>> NetworkInterface still exists, in classpath.  I only got rid of
>> libgcj's divergence.  In our build system, if a file
>> libjava/pkg/pkg/Class.java exists, then it overrides a corresponding
>> libjava/classpath/pkg/pkg/Class.java.  However over time we like to
>> remove these divergences, as they usually cost us more than they are
>> worth.
>
> Ok thanks. Makes sense :-) What happens when libjava/pkg/pkg/Class.h 
> exists but no libjava/pkg/pkg/Class.java? I noticed that the patch 
> leaves the .h files unchanged.
>
>
> Marco