213 lines
8.5 KiB
Diff
213 lines
8.5 KiB
Diff
|
From edd36b26f3506eeb259534ba2493e15c728cd280 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
|
||
|
|
Date: Wed, 25 Jan 2023 19:21:38 -0800
|
||
|
|
Subject: [PATCH 20/50] gprofng: PR30043 libgprofng.so.* are installed to a
|
||
|
|
wrong location
|
||
|
|
|
||
|
|
gprofng/ChangeLog
|
||
|
|
2023-01-25 Vladimir Mezentsev <vladimir.mezentsev@oracle.com>
|
||
|
|
|
||
|
|
PR gprofng/30043
|
||
|
|
PR gprofng/28972
|
||
|
|
* src/Makefile.am: Use lib_LTLIBRARIES instead of pkglib_LTLIBRARIES.
|
||
|
|
* src/Makefile.in: Rebuild.
|
||
|
|
---
|
||
|
|
gprofng/src/Makefile.am | 7 +---
|
||
|
|
gprofng/src/Makefile.in | 76 +++++++++++++++++++----------------------
|
||
|
|
2 files changed, 37 insertions(+), 46 deletions(-)
|
||
|
|
|
||
|
|
--- a/gprofng/src/Makefile.am
|
||
|
|
+++ b/gprofng/src/Makefile.am
|
||
|
|
@@ -124,7 +124,7 @@ BUILT_SOURCES = QLParser.tab.hh
|
||
|
|
EXTRA_DIST = QLParser.yy $(man_MANS)
|
||
|
|
|
||
|
|
|
||
|
|
-pkglib_LTLIBRARIES = $(LIBGPROFNG)
|
||
|
|
+lib_LTLIBRARIES = $(LIBGPROFNG)
|
||
|
|
libgprofng_la_SOURCES = $(CCSOURCES) $(CSOURCES)
|
||
|
|
libgprofng_la_LDFLAGS = -version-info 0:0:0
|
||
|
|
|
||
|
|
@@ -215,9 +215,4 @@ endif
|
||
|
|
# so ensure that the necessary libraries are built at dist time.
|
||
|
|
dist-hook: $(LIBGPROFNG)
|
||
|
|
|
||
|
|
-.PHONY: install-data-local
|
||
|
|
-
|
||
|
|
-install-data-local: install-pkglibLTLIBRARIES
|
||
|
|
- rm -f $(DESTDIR)/$(pkglibdir)/*.la $(DESTDIR)/$(pkglibdir)/*.a
|
||
|
|
-
|
||
|
|
$(srcdir)/DbeSession.cc: QLParser.tab.hh
|
||
|
|
--- a/gprofng/src/Makefile.in
|
||
|
|
+++ b/gprofng/src/Makefile.in
|
||
|
|
@@ -155,9 +155,9 @@ am__uninstall_files_from_dir = { \
|
||
|
|
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
|
||
|
|
$(am__cd) "$$dir" && rm -f $$files; }; \
|
||
|
|
}
|
||
|
|
-am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \
|
||
|
|
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
|
||
|
|
"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(dbedir)"
|
||
|
|
-LTLIBRARIES = $(pkglib_LTLIBRARIES)
|
||
|
|
+LTLIBRARIES = $(lib_LTLIBRARIES)
|
||
|
|
am__DEPENDENCIES_1 =
|
||
|
|
libgprofng_la_DEPENDENCIES = $(top_builddir)/../opcodes/libopcodes.la \
|
||
|
|
$(top_builddir)/../bfd/libbfd.la $(am__DEPENDENCIES_1)
|
||
|
|
@@ -548,7 +548,7 @@ AM_CFLAGS = $(GPROFNG_CFLAGS) $(PTHREAD_
|
||
|
|
AM_CXXFLAGS = $(AM_CFLAGS)
|
||
|
|
BUILT_SOURCES = QLParser.tab.hh
|
||
|
|
EXTRA_DIST = QLParser.yy $(man_MANS)
|
||
|
|
-pkglib_LTLIBRARIES = $(LIBGPROFNG)
|
||
|
|
+lib_LTLIBRARIES = $(LIBGPROFNG)
|
||
|
|
libgprofng_la_SOURCES = $(CCSOURCES) $(CSOURCES)
|
||
|
|
libgprofng_la_LDFLAGS = -version-info 0:0:0
|
||
|
|
|
||
|
|
@@ -636,33 +636,33 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
|
||
|
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||
|
|
$(am__aclocal_m4_deps):
|
||
|
|
|
||
|
|
-install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
|
||
|
|
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
|
||
|
|
@$(NORMAL_INSTALL)
|
||
|
|
- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
|
||
|
|
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || 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)$(pkglibdir)'"; \
|
||
|
|
- $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
|
||
|
|
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
|
||
|
|
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
|
||
|
|
+ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
|
||
|
|
+ $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
|
||
|
|
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
|
||
|
|
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
|
||
|
|
}
|
||
|
|
|
||
|
|
-uninstall-pkglibLTLIBRARIES:
|
||
|
|
+uninstall-libLTLIBRARIES:
|
||
|
|
@$(NORMAL_UNINSTALL)
|
||
|
|
- @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
|
||
|
|
+ @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
|
||
|
|
for p in $$list; do \
|
||
|
|
$(am__strip_dir) \
|
||
|
|
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
|
||
|
|
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
|
||
|
|
+ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
|
||
|
|
+ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
|
||
|
|
done
|
||
|
|
|
||
|
|
-clean-pkglibLTLIBRARIES:
|
||
|
|
- -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
|
||
|
|
- @list='$(pkglib_LTLIBRARIES)'; \
|
||
|
|
+clean-libLTLIBRARIES:
|
||
|
|
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
|
||
|
|
+ @list='$(lib_LTLIBRARIES)'; \
|
||
|
|
locs=`for p in $$list; do echo $$p; done | \
|
||
|
|
sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
|
||
|
|
sort -u`; \
|
||
|
|
@@ -672,7 +672,7 @@ clean-pkglibLTLIBRARIES:
|
||
|
|
}
|
||
|
|
|
||
|
|
libgprofng.la: $(libgprofng_la_OBJECTS) $(libgprofng_la_DEPENDENCIES) $(EXTRA_libgprofng_la_DEPENDENCIES)
|
||
|
|
- $(AM_V_CXXLD)$(libgprofng_la_LINK) -rpath $(pkglibdir) $(libgprofng_la_OBJECTS) $(libgprofng_la_LIBADD) $(LIBS)
|
||
|
|
+ $(AM_V_CXXLD)$(libgprofng_la_LINK) -rpath $(libdir) $(libgprofng_la_OBJECTS) $(libgprofng_la_LIBADD) $(LIBS)
|
||
|
|
install-binPROGRAMS: $(bin_PROGRAMS)
|
||
|
|
@$(NORMAL_INSTALL)
|
||
|
|
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
|
||
|
|
@@ -1039,8 +1039,10 @@ check-am: all-am
|
||
|
|
check: $(BUILT_SOURCES)
|
||
|
|
$(MAKE) $(AM_MAKEFLAGS) check-am
|
||
|
|
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA)
|
||
|
|
+install-binPROGRAMS: install-libLTLIBRARIES
|
||
|
|
+
|
||
|
|
installdirs:
|
||
|
|
- for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(dbedir)"; do \
|
||
|
|
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(dbedir)"; do \
|
||
|
|
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||
|
|
done
|
||
|
|
install: $(BUILT_SOURCES)
|
||
|
|
@@ -1078,8 +1080,8 @@ maintainer-clean-generic:
|
||
|
|
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||
|
|
clean: clean-am
|
||
|
|
|
||
|
|
-clean-am: clean-binPROGRAMS clean-generic clean-libtool \
|
||
|
|
- clean-pkglibLTLIBRARIES mostlyclean-am
|
||
|
|
+clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
|
||
|
|
+ clean-libtool mostlyclean-am
|
||
|
|
|
||
|
|
distclean: distclean-am
|
||
|
|
-rm -rf ./$(DEPDIR)
|
||
|
|
@@ -1099,13 +1101,13 @@ info: info-am
|
||
|
|
|
||
|
|
info-am:
|
||
|
|
|
||
|
|
-install-data-am: install-data-local install-dbeDATA install-man
|
||
|
|
+install-data-am: install-dbeDATA install-man
|
||
|
|
|
||
|
|
install-dvi: install-dvi-am
|
||
|
|
|
||
|
|
install-dvi-am:
|
||
|
|
|
||
|
|
-install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES
|
||
|
|
+install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
|
||
|
|
|
||
|
|
install-html: install-html-am
|
||
|
|
|
||
|
|
@@ -1145,30 +1147,29 @@ ps: ps-am
|
||
|
|
|
||
|
|
ps-am:
|
||
|
|
|
||
|
|
-uninstall-am: uninstall-binPROGRAMS uninstall-dbeDATA uninstall-man \
|
||
|
|
- uninstall-pkglibLTLIBRARIES
|
||
|
|
+uninstall-am: uninstall-binPROGRAMS uninstall-dbeDATA \
|
||
|
|
+ uninstall-libLTLIBRARIES uninstall-man
|
||
|
|
|
||
|
|
uninstall-man: uninstall-man1
|
||
|
|
|
||
|
|
.MAKE: all check install install-am install-strip
|
||
|
|
|
||
|
|
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
|
||
|
|
- clean-binPROGRAMS clean-generic clean-libtool \
|
||
|
|
- clean-pkglibLTLIBRARIES cscopelist-am ctags ctags-am dist-hook \
|
||
|
|
- distclean distclean-compile distclean-generic \
|
||
|
|
- distclean-libtool distclean-tags distdir dvi dvi-am html \
|
||
|
|
- html-am info info-am install install-am install-binPROGRAMS \
|
||
|
|
- install-data install-data-am install-data-local \
|
||
|
|
- install-dbeDATA install-dvi install-dvi-am install-exec \
|
||
|
|
- install-exec-am install-html install-html-am install-info \
|
||
|
|
- install-info-am install-man install-man1 install-pdf \
|
||
|
|
- install-pdf-am install-pkglibLTLIBRARIES install-ps \
|
||
|
|
+ clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
|
||
|
|
+ clean-libtool cscopelist-am ctags ctags-am dist-hook distclean \
|
||
|
|
+ distclean-compile distclean-generic distclean-libtool \
|
||
|
|
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
|
||
|
|
+ install install-am install-binPROGRAMS install-data \
|
||
|
|
+ install-data-am install-dbeDATA install-dvi install-dvi-am \
|
||
|
|
+ install-exec install-exec-am install-html install-html-am \
|
||
|
|
+ install-info install-info-am install-libLTLIBRARIES \
|
||
|
|
+ install-man install-man1 install-pdf install-pdf-am install-ps \
|
||
|
|
install-ps-am install-strip installcheck installcheck-am \
|
||
|
|
installdirs maintainer-clean maintainer-clean-generic \
|
||
|
|
mostlyclean mostlyclean-compile mostlyclean-generic \
|
||
|
|
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
|
||
|
|
uninstall-am uninstall-binPROGRAMS uninstall-dbeDATA \
|
||
|
|
- uninstall-man uninstall-man1 uninstall-pkglibLTLIBRARIES
|
||
|
|
+ uninstall-libLTLIBRARIES uninstall-man uninstall-man1
|
||
|
|
|
||
|
|
.PRECIOUS: Makefile
|
||
|
|
|
||
|
|
@@ -1198,11 +1199,6 @@ QLParser.tab.cc QLParser.tab.hh: QLParse
|
||
|
|
# so ensure that the necessary libraries are built at dist time.
|
||
|
|
dist-hook: $(LIBGPROFNG)
|
||
|
|
|
||
|
|
-.PHONY: install-data-local
|
||
|
|
-
|
||
|
|
-install-data-local: install-pkglibLTLIBRARIES
|
||
|
|
- rm -f $(DESTDIR)/$(pkglibdir)/*.la $(DESTDIR)/$(pkglibdir)/*.a
|
||
|
|
-
|
||
|
|
$(srcdir)/DbeSession.cc: QLParser.tab.hh
|
||
|
|
|
||
|
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|