From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29925 invoked by alias); 5 Oct 2010 08:44:04 -0000 Received: (qmail 29915 invoked by uid 22791); 5 Oct 2010 08:44:03 -0000 X-SWARE-Spam-Status: No, hits=-2.7 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,TW_GC X-Spam-Check-By: sourceware.org Received: from einhorn.in-berlin.de (HELO einhorn.in-berlin.de) (192.109.42.8) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 05 Oct 2010 08:43:58 +0000 X-Envelope-From: doko@ubuntu.com Received: from [192.168.42.17] (dslb-088-073-124-146.pools.arcor-ip.net [88.73.124.146]) (authenticated bits=0) by einhorn.in-berlin.de (8.13.6/8.13.6/Debian-1) with ESMTP id o958htuH000958; Tue, 5 Oct 2010 10:43:56 +0200 Message-ID: <4CAAE54B.70906@ubuntu.com> Date: Tue, 05 Oct 2010 08:44:00 -0000 From: Matthias Klose User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.9) Gecko/20100922 Thunderbird/3.1.4 MIME-Version: 1.0 To: Dr Andrew John Hughes CC: Java Patch List , Ralf Wildenhues Subject: Re: Classpath Merge (1/3): libgcj-import-20100921 References: In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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/msg00004.txt.bz2 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. 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. CCing Ralf for the auto*/libtool stuff. Maybe it's worth documenting the missing libtool bits/versions in libjava/HACKING? > 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. The generated auto* files are usually not included in the diff for the review. > Ok for trunk? Looks okay to me, but I cannot approve it. Matthias