Re: Classpath Merge (1/3): libgcj-import-20100921

[Dr Andrew John Hughes <gnu_andrew@member.fsf.org>]

On 7 October 2010 13:25, Andrew Haley <aph@redhat.com> wrote:
> On 09/28/2010 10:23 PM, Dr Andrew John Hughes wrote:
>> Attached is a merge of GNU Classpath into trunk from the tag
>> libgcj-import-20100921.  This tag was created against revisions as of
>> 2010-06-01 to avoid the whitespace changes on the 3rd.  My intention
>> is to post separate whitespace fixes for gcj and then a second merge
>> containing changes after this change to Classpath.  This merge however
>> contains most of the changes that have lingered in Classpath for a
>> long time since the merge for 4.4.
>>
>> This took longer than expected, mainly due to the presence of
>> generated autotools files in the gcj tree which require regeneration
>> with specific versions.  gcj seems to have decided to use libtool
>> 2.2.7a, which doesn't exist as a release on
>> http://ftp.gnu.org/gnu/libtool/ and I ran into conflicts with macros
>> from the GNU Classpath import which used the system 2.2.10 install.
>> In the end, the solution was to remove the Classpath copy from the m4
>> directory, which caused the 2.2.7a macros in
>> the top-level config directory to be used.
>>
>> The merge has been tested with both java-maintainer mode and
>> non-java-maintainer mode builds, and the Classpath changes have been
>> committed to the classpath tree.
>>
>> Ok for trunk?
>
> OK.
>
> Andrew.
>

Thanks.  Pushed to trunk.

I'll look at the autoconf issues raised by Ralf in Classpath first,
then port the fix over in the next merge after its had some testing.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8