From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1666) id CA7783858D38; Tue, 31 Jan 2023 14:55:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CA7783858D38 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675176935; bh=Csqpp0mWKMwrLW5NOzmEGGtBTmVaU15F1AI8vN4TgKs=; h=From:To:Subject:Date:From; b=LkhedbgGBAIq5Y725exn9ARopprrAb+TDo00J1AVKYLYYg23+3UkbIbGx58Str56j EoaOYKncvigPtL/zi99L3xZEr0ck/58MTssYhEqMbdJis35lC0LR+1LkMk03IAeDZf Q87Ene2tqbZK5NiSWq1ZpAvNB4R9dkAwcDMjDvK4= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Richard Biener To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-5576] modula2/108462 - duplicate install of static modula2 target libs X-Act-Checkin: gcc X-Git-Author: Richard Biener X-Git-Refname: refs/heads/master X-Git-Oldrev: 50335ddd301404e9053786b26a23a924471b4d09 X-Git-Newrev: 7f583a335769591d016caa51490e3e5dd50354fe Message-Id: <20230131145535.CA7783858D38@sourceware.org> Date: Tue, 31 Jan 2023 14:55:35 +0000 (GMT) List-Id: https://gcc.gnu.org/g:7f583a335769591d016caa51490e3e5dd50354fe commit r13-5576-g7f583a335769591d016caa51490e3e5dd50354fe Author: Richard Biener Date: Mon Jan 23 11:43:53 2023 +0100 modula2/108462 - duplicate install of static modula2 target libs 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. 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. Diff: --- 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 e7c72732ade..a03af21a8a7 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 677aebf0a60..176ca55d15c 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 af3728bd1e1..843b595b39e 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 b327cbcfab5..55cafa233b3 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 b7640ddd96c..e8e4581adaf 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 3097ea38124..11e25cab741 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 f63f2436747..66335494a48 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 7e4496c9ff1..0ef7642cb66 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)'; \