From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32553 invoked by alias); 5 Oct 2010 13:01:20 -0000 Received: (qmail 32543 invoked by uid 22791); 5 Oct 2010 13:01:19 -0000 X-SWARE-Spam-Status: No, hits=-0.7 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,TW_GC,TW_SV,T_HK_NAME_FM_DR X-Spam-Check-By: sourceware.org Received: from mail-yx0-f175.google.com (HELO mail-yx0-f175.google.com) (209.85.213.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 05 Oct 2010 13:01:14 +0000 Received: by yxg6 with SMTP id 6so2230302yxg.20 for ; Tue, 05 Oct 2010 06:01:12 -0700 (PDT) MIME-Version: 1.0 Received: by 10.150.11.11 with SMTP id 11mr67378ybk.219.1286283672384; Tue, 05 Oct 2010 06:01:12 -0700 (PDT) Received: by 10.220.74.71 with HTTP; Tue, 5 Oct 2010 06:01:12 -0700 (PDT) In-Reply-To: <4CAAE54B.70906@ubuntu.com> References: <4CAAE54B.70906@ubuntu.com> Date: Tue, 05 Oct 2010 13:01:00 -0000 Message-ID: Subject: Re: Classpath Merge (1/3): libgcj-import-20100921 From: Dr Andrew John Hughes To: Matthias Klose Cc: Java Patch List , Ralf Wildenhues Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-IsSubscribed: yes Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-patches-owner@gcc.gnu.org X-SW-Source: 2010-q4/txt/msg00006.txt.bz2 On 5 October 2010 09:43, Matthias Klose wrote: > On 28.09.2010 23:23, Dr Andrew John Hughes wrote: >> >> Attached is a merge of GNU Classpath into trunk from the tag >> libgcj-import-20100921. =C2=A0This tag was created against revisions as = of >> 2010-06-01 to avoid the whitespace changes on the 3rd. =C2=A0My intention >> is to post separate whitespace fixes for gcj and then a second merge >> containing changes after this change to Classpath. =C2=A0This merge howe= ver >> 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. =C2=A0gcj 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. > > CCing Ralf for the auto*/libtool stuff. Maybe it's worth documenting the > missing libtool bits/versions in libjava/HACKING? > Most of the problem was just working out what was going on, but yes I'll certainly document it to save later head-scratching. >> 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. > > I assume that the correct ecj.jar from sourceware.org:/pub/java was used = to > generate the class files. Yes AFAIK - it depends what you mean by 'the correct ecj.jar'. The only changed class files are ones with changed source files so it presumably generated identical class files for the unchanged source files. > > The generated auto* files are usually not included in the diff for the > review. > Then they shouldn't be in svn :-) >> Ok for trunk? > > Looks okay to me, but I cannot approve it. > > =C2=A0Matthias > Thanks for checking it over anyway, Cheers, --=20 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=C2=A0 7927 142C 2591 94EF D9D8