From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20974 invoked by alias); 9 Dec 2013 14:31:54 -0000 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 Received: (qmail 20950 invoked by uid 89); 9 Dec 2013 14:31:53 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.4 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mail-wg0-f51.google.com Received: from Unknown (HELO mail-wg0-f51.google.com) (74.125.82.51) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Mon, 09 Dec 2013 14:31:53 +0000 Received: by mail-wg0-f51.google.com with SMTP id b13so3449140wgh.6 for ; Mon, 09 Dec 2013 06:31:43 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.180.108.132 with SMTP id hk4mr14729388wib.12.1386599503580; Mon, 09 Dec 2013 06:31:43 -0800 (PST) Received: by 10.195.12.114 with HTTP; Mon, 9 Dec 2013 06:31:43 -0800 (PST) In-Reply-To: References: Date: Mon, 09 Dec 2013 14:31:00 -0000 Message-ID: Subject: Re: [PATCH] Properly install libgcc_bc dummy library From: Richard Biener To: Andreas Schwab Cc: GCJ-patches , GCC Patches Content-Type: text/plain; charset=ISO-8859-1 X-SW-Source: 2013-q4/txt/msg00006.txt.bz2 On Mon, Dec 9, 2013 at 3:08 PM, Andreas Schwab wrote: > The rules to install the dummy libgcc_bc library have never worked as > intented, probably due to the fact that the fedora gcc package installs > it by hand, ignoring all damage that has been done. The target that > creates libgcj_bc.la for the testsuite is mucking around with internal > details that will confuse libtool when it tries to install it, the > effect of which can't be undone by install-exec-hook. We need to create > a clean second copy that is actually installed. Ok if nobody objects in the next 24h. Thanks, Richard. > Andreas. > > * Makefile.am (toolexeclib_LTLIBRARIES) [USE_LIBGCJ_BC]: Use > install/libgcj_bc.la instead of libgcj_bc.la. > (noinst_LTLIBRARIES) [USE_LIBGCJ_BC]: Define. > (install_libgcj_bc_la_SOURCES): Define. > (install/libgcj_bc.la): New rule. > * Makefile.in: Regenerate. > > diff --git a/libjava/Makefile.am b/libjava/Makefile.am > index dce1bb0..5af58fa 100644 > --- a/libjava/Makefile.am > +++ b/libjava/Makefile.am > @@ -212,7 +212,8 @@ LIBJAVA_CORE_EXTRA = > endif > > if USE_LIBGCJ_BC > -toolexeclib_LTLIBRARIES += libgcj_bc.la > +toolexeclib_LTLIBRARIES += install/libgcj_bc.la > +noinst_LTLIBRARIES = libgcj_bc.la > endif > > if XLIB_AWT > @@ -606,6 +607,7 @@ lib_gnu_awt_xlib_la_LINK = $(LIBLINK) $(lib_gnu_awt_xlib_la_LDFLAGS) \ > ## This lets us have one soname in BC objects and another in C++ ABI objects. > ## This library is not linked against libgcj. > libgcj_bc_la_SOURCES = libgcj_bc.c > +install_libgcj_bc_la_SOURCES = $(libgcj_bc_la_SOURCES) > libgcj_bc_la_LDFLAGS = -rpath $(toolexeclibdir) -no-static -version-info 1:0:0 \ > $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBJAVA_LDFLAGS_NOUNDEF) > libgcj_bc_la_DEPENDENCIES = libgcj.la $(libgcj_bc_la_version_dep) > @@ -628,6 +630,11 @@ libgcj_bc.la: $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_DEPENDENCIES) > rm .libs/libgcj_bc.so.1; \ > $(LN_S) libgcj_bc.so.1.0.0 .libs/libgcj_bc.so.1 > > +## This rule creates the libgcj_bc library that is actually installed. > +install/libgcj_bc.la: $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_DEPENDENCIES) install/$(am__dirstamp) > + $(libgcj_bc_la_LINK) $(am_libgcj_bc_la_rpath) $(libgcj_bc_la_LDFLAGS) \ > + $(libgcj_bc_la_OBJECTS) $(libgcj_bc_la_LIBADD) $(LIBS) > + > ## Note that property_files is defined in sources.am. > propertyo_files = $(patsubst classpath/resource/%,%,$(addsuffix .lo,$(property_files))) > > > -- > Andreas Schwab, SUSE Labs, schwab@suse.de > GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 > "And now for something completely different."