]> gcc.gnu.org Git - gcc.git/commitdiff
git://gcc.gnu.org / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 50335dd)
modula2/108462 - duplicate install of static modula2 target libs
authorRichard Biener <rguenther@suse.de>
Mon, 23 Jan 2023 10:43:53 +0000 (11:43 +0100)
committerRichard Biener <rguenther@suse.de>
Tue, 31 Jan 2023 14:54:17 +0000 (15:54 +0100)
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.

libgm2/libm2cor/Makefile.am patch | blob | blame | history
libgm2/libm2cor/Makefile.in patch | blob | blame | history
libgm2/libm2iso/Makefile.am patch | blob | blame | history
libgm2/libm2iso/Makefile.in patch | blob | blame | history
libgm2/libm2log/Makefile.am patch | blob | blame | history
libgm2/libm2log/Makefile.in patch | blob | blame | history
libgm2/libm2min/Makefile.am patch | blob | blame | history
libgm2/libm2min/Makefile.in patch | blob | blame | history
libgm2/libm2pim/Makefile.am patch | blob | blame | history
libgm2/libm2pim/Makefile.in patch | blob | blame | history

diff --git a/libgm2/libm2cor/Makefile.am b/libgm2/libm2cor/Makefile.am
index e7c72732ade932a2c61d89a7538d5d24c63a7672..a03af21a8a7380305dae7a48cb4c20cde30a282c 100644 (file)
--- 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 677aebf0a605b7004efc4541c08b38a6202f8865..176ca55d15c6d7654587e26b80cd1a93e0c41c34 100644 (file)
--- 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 af3728bd1e16ae90f7ef0d33acfc6cab1ceca443..843b595b39e0a097598212649a58c7b2cd68bc90 100644 (file)
--- 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 b327cbcfab5c9523f90c3969d5dc85e6f4ced28a..55cafa233b32a8bbdd59fe9186d564aeda62cf64 100644 (file)
--- 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 b7640ddd96cf886df9c502ceb98e9c08d8e7081c..e8e4581adafd74da3cc7e97fc18f931116c8ae00 100644 (file)
--- 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 3097ea381244a487d8195eae16fdcc9751f5d53f..11e25cab741473133f1f3216c7b955651d75256c 100644 (file)
--- 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 f63f2436747b97521a3dd3af494edce6f965e481..66335494a4830478565caa8598f5074eff09e7d3 100644 (file)
--- 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 7e4496c9ff1c8f288518d535b6ca04010ce8218e..0ef7642cb6663c47c28070db64085a6b00b03a66 100644 (file)
--- 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 35fefae59c11a4aeecde8159f8f279f2e6c73af6..aa4c4c89bfcda2d4e3c0f4823a3d974f1361ab5f 100644 (file)
--- 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 85754b6195ba470240892d6511fec127cfac3b9b..7d81a7a86fc937f07ffbaeec7d1ad7725faa5c08 100644 (file)
--- 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)'; \
GNU Compiler Collection
This page took 0.070765 seconds and 5 git commands to generate.