From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24602 invoked by alias); 6 Oct 2010 18:54:41 -0000 Received: (qmail 24569 invoked by uid 22791); 6 Oct 2010 18:54:40 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00,MISSING_MID,TW_IB,T_HK_NAME_MR_MRS X-Spam-Check-By: sourceware.org Received: from localhost (HELO gcc.gnu.org) (127.0.0.1) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 06 Oct 2010 18:54:37 +0000 From: "mrs at gcc dot gnu.org" To: java-prs@gcc.gnu.org Subject: [Bug java/43839] libjava incorrectly uses -liconv in testsuite, jni.exp when using --with-libiconv-prefix X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: gcc X-Bugzilla-Component: java X-Bugzilla-Keywords: X-Bugzilla-Severity: normal X-Bugzilla-Who: mrs at gcc dot gnu.org X-Bugzilla-Status: RESOLVED X-Bugzilla-Priority: P3 X-Bugzilla-Assigned-To: unassigned at gcc dot gnu.org X-Bugzilla-Target-Milestone: --- X-Bugzilla-Changed-Fields: In-Reply-To: References: X-Bugzilla-URL: http://gcc.gnu.org/bugzilla/ Auto-Submitted: auto-generated Content-Type: text/plain; charset="UTF-8" MIME-Version: 1.0 Date: Wed, 06 Oct 2010 18:54:00 -0000 Mailing-List: contact java-prs-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-prs-owner@gcc.gnu.org X-SW-Source: 2010-q4/txt/msg00007.txt.bz2 Message-ID: <20101006185400.VHQdOUfnLjCgbOvnhLTpb0SMgDHm8uNSakWTmWwBCa0@z> http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43839 --- Comment #12 from mrs at gcc dot gnu.org 2010-10-06 18:54:31 UTC --- Author: mrs Date: Wed Oct 6 18:54:14 2010 New Revision: 165061 URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=165061 Log: 2010-10-06 Jack Howarth Backport from mainline 2010-05-03 Jack Howarth PR java/43839 * testsuite/Makefile.am: Override automake for site.exp creation and add entry to set libiconv. * testsuite/Makefile.in: Regenerate. * testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation): Add new global variable libiconv to handle alternative libiconv locations. Modified: branches/gcc-4_5-branch/libjava/ChangeLog branches/gcc-4_5-branch/libjava/testsuite/Makefile.am branches/gcc-4_5-branch/libjava/testsuite/Makefile.in branches/gcc-4_5-branch/libjava/testsuite/libjava.jni/jni.exp