From c92ee4037c3a6df882907c06ae6313d2dcb0cc0d Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Fri, 24 Sep 2021 20:38:01 +0200 Subject: Install libcaf_shared libraries in the same directory as libgfortran. --- libgfortran/Makefile.am | 6 ++-- libgfortran/Makefile.in | 85 +++++++++++++------------------------------------ libgfortran/configure | 1 - 3 files changed, 26 insertions(+), 66 deletions(-) diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am index bebe958b710..f2194fe61c7 100644 --- a/libgfortran/Makefile.am +++ b/libgfortran/Makefile.am @@ -38,11 +38,13 @@ LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \ if LIBGFOR_NATIVE_COARRAY COARRAY_LIBS=$(PTHREAD_LIBS) $(RT_LIBS) +toolexeclib_LTLIBRARIES = libgfortran.la libcaf_shared.la else COARRAY_LIBS="" +toolexeclib_LTLIBRARIES = libgfortran.la endif -toolexeclib_LTLIBRARIES = libgfortran.la + toolexeclib_DATA = libgfortran.spec libgfortran_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS) libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ @@ -78,8 +80,6 @@ i_cas_collsub_s_c = \ if LIBGFOR_NATIVE_COARRAY -caf_shared_LTLIBRARIES = libcaf_shared.la -caf_shareddir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) libcaf_shared_la_SOURCES = caf_shared/alloc.c caf_shared/allocator.c caf_shared/coarraynative.c \ caf_shared/hashmap.c \ caf_shared/sync.c caf_shared/util.c caf_shared/wrapper.c caf_shared/collective_subroutine.c \ diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in index 495cb9c4a6a..7838c79c1fd 100644 --- a/libgfortran/Makefile.in +++ b/libgfortran/Makefile.in @@ -215,12 +215,10 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(caf_shareddir)" \ - "$(DESTDIR)$(cafexeclibdir)" "$(DESTDIR)$(toolexeclibdir)" \ - "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(gfor_cdir)" \ - "$(DESTDIR)$(fincludedir)" -LTLIBRARIES = $(caf_shared_LTLIBRARIES) $(cafexeclib_LTLIBRARIES) \ - $(toolexeclib_LTLIBRARIES) +am__installdirs = "$(DESTDIR)$(cafexeclibdir)" \ + "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibdir)" \ + "$(DESTDIR)$(gfor_cdir)" "$(DESTDIR)$(fincludedir)" +LTLIBRARIES = $(cafexeclib_LTLIBRARIES) $(toolexeclib_LTLIBRARIES) libcaf_shared_la_LIBADD = am__objects_1 = cas_collsub_i1.lo cas_collsub_i2.lo cas_collsub_i4.lo \ cas_collsub_i8.lo cas_collsub_i16.lo cas_collsub_r4.lo \ @@ -236,7 +234,7 @@ am__objects_2 = cas_collsub_s1.lo cas_collsub_s4.lo @LIBGFOR_NATIVE_COARRAY_TRUE@ $(am__objects_1) $(am__objects_2) libcaf_shared_la_OBJECTS = $(am_libcaf_shared_la_OBJECTS) @LIBGFOR_NATIVE_COARRAY_TRUE@am_libcaf_shared_la_rpath = -rpath \ -@LIBGFOR_NATIVE_COARRAY_TRUE@ $(caf_shareddir) +@LIBGFOR_NATIVE_COARRAY_TRUE@ $(toolexeclibdir) libcaf_single_la_LIBADD = am_libcaf_single_la_OBJECTS = single.lo libcaf_single_la_OBJECTS = $(am_libcaf_single_la_OBJECTS) @@ -486,6 +484,10 @@ am__objects_67 = $(am__objects_5) $(am__objects_55) $(am__objects_57) \ @onestep_FALSE@am_libgfortran_la_OBJECTS = $(am__objects_67) @onestep_TRUE@am_libgfortran_la_OBJECTS = libgfortran_c.lo libgfortran_la_OBJECTS = $(am_libgfortran_la_OBJECTS) +@LIBGFOR_NATIVE_COARRAY_FALSE@am_libgfortran_la_rpath = -rpath \ +@LIBGFOR_NATIVE_COARRAY_FALSE@ $(toolexeclibdir) +@LIBGFOR_NATIVE_COARRAY_TRUE@am_libgfortran_la_rpath = -rpath \ +@LIBGFOR_NATIVE_COARRAY_TRUE@ $(toolexeclibdir) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -755,7 +757,8 @@ gfor_cdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \ $(lt_host_flags) -toolexeclib_LTLIBRARIES = libgfortran.la +@LIBGFOR_NATIVE_COARRAY_FALSE@toolexeclib_LTLIBRARIES = libgfortran.la +@LIBGFOR_NATIVE_COARRAY_TRUE@toolexeclib_LTLIBRARIES = libgfortran.la libcaf_shared.la toolexeclib_DATA = libgfortran.spec libgfortran_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS) libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ @@ -787,8 +790,6 @@ i_cas_collsub_s_c = \ $(srcdir)/generated/cas_collsub_s1.c \ $(srcdir)/generated/cas_collsub_s4.c -@LIBGFOR_NATIVE_COARRAY_TRUE@caf_shared_LTLIBRARIES = libcaf_shared.la -@LIBGFOR_NATIVE_COARRAY_TRUE@caf_shareddir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR) @LIBGFOR_NATIVE_COARRAY_TRUE@libcaf_shared_la_SOURCES = caf_shared/alloc.c caf_shared/allocator.c caf_shared/coarraynative.c \ @LIBGFOR_NATIVE_COARRAY_TRUE@ caf_shared/hashmap.c \ @LIBGFOR_NATIVE_COARRAY_TRUE@ caf_shared/sync.c caf_shared/util.c caf_shared/wrapper.c caf_shared/collective_subroutine.c \ @@ -1687,41 +1688,6 @@ distclean-hdr: libgfortran.spec: $(top_builddir)/config.status $(srcdir)/libgfortran.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ -install-caf_sharedLTLIBRARIES: $(caf_shared_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(caf_shared_LTLIBRARIES)'; test -n "$(caf_shareddir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(caf_shareddir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(caf_shareddir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(caf_shareddir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(caf_shareddir)"; \ - } - -uninstall-caf_sharedLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(caf_shared_LTLIBRARIES)'; test -n "$(caf_shareddir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(caf_shareddir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(caf_shareddir)/$$f"; \ - done - -clean-caf_sharedLTLIBRARIES: - -test -z "$(caf_shared_LTLIBRARIES)" || rm -f $(caf_shared_LTLIBRARIES) - @list='$(caf_shared_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - install-cafexeclibLTLIBRARIES: $(cafexeclib_LTLIBRARIES) @$(NORMAL_INSTALL) @list='$(cafexeclib_LTLIBRARIES)'; test -n "$(cafexeclibdir)" || list=; \ @@ -1799,7 +1765,7 @@ libcaf_single.la: $(libcaf_single_la_OBJECTS) $(libcaf_single_la_DEPENDENCIES) $ $(AM_V_GEN)$(libcaf_single_la_LINK) -rpath $(cafexeclibdir) $(libcaf_single_la_OBJECTS) $(libcaf_single_la_LIBADD) $(LIBS) libgfortran.la: $(libgfortran_la_OBJECTS) $(libgfortran_la_DEPENDENCIES) $(EXTRA_libgfortran_la_DEPENDENCIES) - $(AM_V_GEN)$(libgfortran_la_LINK) -rpath $(toolexeclibdir) $(libgfortran_la_OBJECTS) $(libgfortran_la_LIBADD) $(LIBS) + $(AM_V_GEN)$(libgfortran_la_LINK) $(am_libgfortran_la_rpath) $(libgfortran_la_OBJECTS) $(libgfortran_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -7095,7 +7061,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS) config.h all-local installdirs: - for dir in "$(DESTDIR)$(caf_shareddir)" "$(DESTDIR)$(cafexeclibdir)" "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(gfor_cdir)" "$(DESTDIR)$(fincludedir)"; do \ + for dir in "$(DESTDIR)$(cafexeclibdir)" "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(gfor_cdir)" "$(DESTDIR)$(fincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -7132,9 +7098,8 @@ maintainer-clean-generic: -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-caf_sharedLTLIBRARIES clean-cafexeclibLTLIBRARIES \ - clean-generic clean-libtool clean-local \ - clean-toolexeclibLTLIBRARIES mostlyclean-am +clean-am: clean-cafexeclibLTLIBRARIES clean-generic clean-libtool \ + clean-local clean-toolexeclibLTLIBRARIES mostlyclean-am distclean: distclean-am -rm -f $(am__CONFIG_DISTCLEAN_FILES) @@ -7155,8 +7120,7 @@ info: info-am info-am: -install-data-am: install-caf_sharedLTLIBRARIES install-gfor_cHEADERS \ - install-nodist_fincludeHEADERS +install-data-am: install-gfor_cHEADERS install-nodist_fincludeHEADERS install-dvi: install-dvi-am @@ -7206,21 +7170,19 @@ ps: ps-am ps-am: -uninstall-am: uninstall-caf_sharedLTLIBRARIES \ - uninstall-cafexeclibLTLIBRARIES uninstall-gfor_cHEADERS \ +uninstall-am: uninstall-cafexeclibLTLIBRARIES uninstall-gfor_cHEADERS \ uninstall-nodist_fincludeHEADERS uninstall-toolexeclibDATA \ uninstall-toolexeclibLTLIBRARIES .MAKE: all check install install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am all-local am--refresh check \ - check-am clean clean-caf_sharedLTLIBRARIES \ - clean-cafexeclibLTLIBRARIES clean-cscope clean-generic \ - clean-libtool clean-local clean-toolexeclibLTLIBRARIES cscope \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-local distclean-tags dvi dvi-am html html-am info \ - info-am install install-am install-caf_sharedLTLIBRARIES \ + check-am clean clean-cafexeclibLTLIBRARIES clean-cscope \ + clean-generic clean-libtool clean-local \ + clean-toolexeclibLTLIBRARIES cscope cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-hdr distclean-libtool distclean-local distclean-tags \ + dvi dvi-am html html-am info info-am install install-am \ install-cafexeclibLTLIBRARIES install-data install-data-am \ install-dvi install-dvi-am install-exec install-exec-am \ install-exec-local install-gfor_cHEADERS install-html \ @@ -7232,7 +7194,6 @@ uninstall-am: uninstall-caf_sharedLTLIBRARIES \ maintainer-clean-local mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \ pdf-am ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-caf_sharedLTLIBRARIES \ uninstall-cafexeclibLTLIBRARIES uninstall-gfor_cHEADERS \ uninstall-nodist_fincludeHEADERS uninstall-toolexeclibDATA \ uninstall-toolexeclibLTLIBRARIES diff --git a/libgfortran/configure b/libgfortran/configure index 599c8804f37..3e0e509d83c 100755 --- a/libgfortran/configure +++ b/libgfortran/configure @@ -30649,4 +30649,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi -echo HUHU $LIBGFOR_NATIVE_COARRAY -- cgit v1.2.3