From patchwork Mon Jan 23 10:50:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 63585 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7CFD43858D38 for ; Mon, 23 Jan 2023 10:50:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7CFD43858D38 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1674471053; bh=PlDURm2dg5ouM+/KZdyokSwt8XRpuyDVJHNcZpv0oOc=; h=Date:To:cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=tUUlG/oC031Xx68lnrEdzHGcsN44IX1mKO3W+/BgApyEL4RKiEC1D3DNwEvXyQJQa 9aRaqoJcx/kYhhSdOoQWhXhcH2aoFq+lZA6Hep/hXEpcTelMXWITMCgkxIlffnOUoJ O17V0a+StaU+XduDVsUp9k5ODljoHZj/8ny10uYA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by sourceware.org (Postfix) with ESMTPS id 62EF53858D32 for ; Mon, 23 Jan 2023 10:50:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 62EF53858D32 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B060834202; Mon, 23 Jan 2023 10:50:23 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 983A51357F; Mon, 23 Jan 2023 10:50:23 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id v7v+I29mzmPIKgAAMHmgww (envelope-from ); Mon, 23 Jan 2023 10:50:23 +0000 Date: Mon, 23 Jan 2023 11:50:23 +0100 (CET) To: gcc-patches@gcc.gnu.org cc: gaiusmod2@gmail.com Subject: [PATCH] modula2/108462 - duplicate install of static modula2 target libs MIME-Version: 1.0 Message-Id: <20230123105023.983A51357F@imap2.suse-dmz.suse.de> X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The following addresses the fact that libgm2 installs static libraries into two places, one performed by toolexeclib_LTLIBRARIES = libm2cor.la and one performed as part of the install-data-local rule to a m2/m2cor subdirectory alongside Modula-2 .def and .mod files. This patch opts to keep the copy installed by libtool and removes the extra installs in the install-data-local rules. I've built and installed both with and without --enable-version-specific-runtime-libs and compiled and linked a Modula-2 testcase with the installed compiler with the two multilibs and with and without static successfully. OK for trunk? Thanks, Richard. PR modula2/108462 libgm2/ * libm2cor/Makefile.am: Remove static lib install from install-data-local. * libm2iso/Makefile.am: Likewise. * libm2log/Makefile.am: Likewise. * libm2min/Makefile.am: Likewise. * libm2pim/Makefile.am: Likewise. * libm2cor/Makefile.in: Regenerate. * libm2iso/Makefile.in: Likewise. * libm2log/Makefile.in: Likewise. * libm2min/Makefile.in: Likewise. * libm2pim/Makefile.in: Likewise. --- libgm2/libm2cor/Makefile.am | 5 ----- libgm2/libm2cor/Makefile.in | 5 ----- libgm2/libm2iso/Makefile.am | 5 ----- libgm2/libm2iso/Makefile.in | 5 ----- libgm2/libm2log/Makefile.am | 5 ----- libgm2/libm2log/Makefile.in | 5 ----- libgm2/libm2min/Makefile.am | 5 ----- libgm2/libm2min/Makefile.in | 5 ----- libgm2/libm2pim/Makefile.am | 4 ---- libgm2/libm2pim/Makefile.in | 4 ---- 10 files changed, 48 deletions(-) diff --git a/libgm2/libm2cor/Makefile.am b/libgm2/libm2cor/Makefile.am index 2cc30847849..2624a7d469f 100644 --- a/libgm2/libm2cor/Makefile.am +++ b/libgm2/libm2cor/Makefile.am @@ -140,11 +140,6 @@ SYSTEM.def: Makefile install-data-local: force mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - $(INSTALL_DATA) .libs/libm2cor.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.la - $(INSTALL_DATA) .libs/libm2cor.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.a - $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.a for i in $(M2DEFS) $(M2MODS) ; do \ if [ -f $$i ] ; then \ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ diff --git a/libgm2/libm2cor/Makefile.in b/libgm2/libm2cor/Makefile.in index 8806d7bccf6..4869e99c64e 100644 --- a/libgm2/libm2cor/Makefile.in +++ b/libgm2/libm2cor/Makefile.in @@ -806,11 +806,6 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_CORLIB_TRUE@install-data-local: force @BUILD_CORLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) -@BUILD_CORLIB_TRUE@ $(INSTALL_DATA) .libs/libm2cor.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) -@BUILD_CORLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.la -@BUILD_CORLIB_TRUE@ $(INSTALL_DATA) .libs/libm2cor.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) -@BUILD_CORLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.a -@BUILD_CORLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2cor.a @BUILD_CORLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \ @BUILD_CORLIB_TRUE@ if [ -f $$i ] ; then \ @BUILD_CORLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ diff --git a/libgm2/libm2iso/Makefile.am b/libgm2/libm2iso/Makefile.am index a28cd5ac8aa..b5962d9c72c 100644 --- a/libgm2/libm2iso/Makefile.am +++ b/libgm2/libm2iso/Makefile.am @@ -220,11 +220,6 @@ SYSTEM.def: Makefile install-data-local: force mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2iso.la - $(INSTALL_DATA) .libs/libm2iso.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a - $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a for i in $(M2DEFS) $(M2MODS) ; do \ if [ -f $$i ] ; then \ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ diff --git a/libgm2/libm2iso/Makefile.in b/libgm2/libm2iso/Makefile.in index 0ca852a6124..cd65d6cad56 100644 --- a/libgm2/libm2iso/Makefile.in +++ b/libgm2/libm2iso/Makefile.in @@ -919,11 +919,6 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_ISOLIB_TRUE@install-data-local: force @BUILD_ISOLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) -@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) .libs/libm2iso.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) -@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2iso.la -@BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) .libs/libm2iso.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) -@BUILD_ISOLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a -@BUILD_ISOLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)/libm2iso.a @BUILD_ISOLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \ @BUILD_ISOLIB_TRUE@ if [ -f $$i ] ; then \ @BUILD_ISOLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ diff --git a/libgm2/libm2log/Makefile.am b/libgm2/libm2log/Makefile.am index 9b28d3e3d5b..451cd3802bd 100644 --- a/libgm2/libm2log/Makefile.am +++ b/libgm2/libm2log/Makefile.am @@ -150,11 +150,6 @@ M2LIBDIR = /m2/m2log/ install-data-local: force mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - $(INSTALL_DATA) .libs/libm2log.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.la - $(INSTALL_DATA) .libs/libm2log.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.a - $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.a for i in $(M2DEFS) $(M2MODS) ; do \ if [ -f $$i ] ; then \ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ diff --git a/libgm2/libm2log/Makefile.in b/libgm2/libm2log/Makefile.in index 5afee42c31b..33bbc93e3a7 100644 --- a/libgm2/libm2log/Makefile.in +++ b/libgm2/libm2log/Makefile.in @@ -783,11 +783,6 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_LOGLIB_TRUE@install-data-local: force @BUILD_LOGLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) -@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) .libs/libm2log.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) -@BUILD_LOGLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.la -@BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) .libs/libm2log.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) -@BUILD_LOGLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.a -@BUILD_LOGLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2log.a @BUILD_LOGLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \ @BUILD_LOGLIB_TRUE@ if [ -f $$i ] ; then \ @BUILD_LOGLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ diff --git a/libgm2/libm2min/Makefile.am b/libgm2/libm2min/Makefile.am index bbbf3d4f943..a2545fca846 100644 --- a/libgm2/libm2min/Makefile.am +++ b/libgm2/libm2min/Makefile.am @@ -133,11 +133,6 @@ SYSTEM.def: Makefile install-data-local: force mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - $(INSTALL_DATA) .libs/libm2min.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.la - $(INSTALL_DATA) .libs/libm2min.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.a - $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.a for i in $(M2DEFS) $(M2MODS) ; do \ if [ -f $$i ] ; then \ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ diff --git a/libgm2/libm2min/Makefile.in b/libgm2/libm2min/Makefile.in index ad818bc01d5..e62f5d9f0bb 100644 --- a/libgm2/libm2min/Makefile.in +++ b/libgm2/libm2min/Makefile.in @@ -759,11 +759,6 @@ SYSTEM.def: Makefile install-data-local: force mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - $(INSTALL_DATA) .libs/libm2min.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.la - $(INSTALL_DATA) .libs/libm2min.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.a - $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2min.a for i in $(M2DEFS) $(M2MODS) ; do \ if [ -f $$i ] ; then \ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ diff --git a/libgm2/libm2pim/Makefile.am b/libgm2/libm2pim/Makefile.am index 35fefae59c1..aa4c4c89bfc 100644 --- a/libgm2/libm2pim/Makefile.am +++ b/libgm2/libm2pim/Makefile.am @@ -193,10 +193,6 @@ SYSTEM.def: Makefile install-data-local: force mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.la - $(INSTALL_DATA) .libs/libm2pim.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) - $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.a for i in $(M2DEFS) $(M2MODS) ; do \ if [ -f $$i ] ; then \ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \ diff --git a/libgm2/libm2pim/Makefile.in b/libgm2/libm2pim/Makefile.in index 85754b6195b..7d81a7a86fc 100644 --- a/libgm2/libm2pim/Makefile.in +++ b/libgm2/libm2pim/Makefile.in @@ -893,10 +893,6 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES @BUILD_PIMLIB_TRUE@install-data-local: force @BUILD_PIMLIB_TRUE@ mkdir -p $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) -@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) .libs/libm2pim.la $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) -@BUILD_PIMLIB_TRUE@ chmod 644 $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.la -@BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) .libs/libm2pim.a $(DESTDIR)$(inst_libdir)/$(M2LIBDIR) -@BUILD_PIMLIB_TRUE@ $(RANLIB) $(DESTDIR)$(inst_libdir)/$(M2LIBDIR)libm2pim.a @BUILD_PIMLIB_TRUE@ for i in $(M2DEFS) $(M2MODS) ; do \ @BUILD_PIMLIB_TRUE@ if [ -f $$i ] ; then \ @BUILD_PIMLIB_TRUE@ $(INSTALL_DATA) $$i '$(DESTDIR)$(inst_libdir)/$(M2LIBDIR)'; \