gprofng: use the --libdir path to find libraries

gprofng/ChangeLog
2022-10-10  Vladimir Mezentsev  <vladimir.mezentsev@oracle.com>

	PR gprofng/29663
	* src/Makefile.am: Add -DLIBDIR to CPPFLAGS.
	* src/Makefile.in: Rebuild.
	* src/envsets.cc (putenv_libcollector_ld_misc): Use LIBDIR to find
	the gprofng libraries.

diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am
index 6e0931524e4e82fc87e1a48ab06a7c1a4dba6669..27ef7974afed93ec279e37ffe28448fef144984c 100644 (file)
--- a/gprofng/src/Makefile.am
+++ b/gprofng/src/Makefile.am
@@ -108,7 +108,7 @@ LOCALEDIR = @localedir@
 SYSCONFDIR = @sysconfdir@
 
 AM_CPPFLAGS = $(GPROFNG_CPPFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" \
-       -DSYSCONFDIR=\"$(SYSCONFDIR)\" \
+       -DSYSCONFDIR=\"$(SYSCONFDIR)\" -DLIBDIR=\"$(libdir)\" \
        -I.. -I$(srcdir) \
        -I$(srcdir)/../common \
        -I$(srcdir)/../../include -I$(srcdir)/../../opcodes \

diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in
index ba7fdd6e8ad2bf258b67982703f4bb3b3e1a7de2..7efdb9885f6c12c2a1ac7fe6041a039acf0665ef 100644 (file)
--- a/gprofng/src/Makefile.in
+++ b/gprofng/src/Makefile.in
@@ -536,7 +536,7 @@ ZLIBINC = @zlibinc@
 LOCALEDIR = @localedir@
 SYSCONFDIR = @sysconfdir@
 AM_CPPFLAGS = $(GPROFNG_CPPFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" \
-       -DSYSCONFDIR=\"$(SYSCONFDIR)\" \
+       -DSYSCONFDIR=\"$(SYSCONFDIR)\" -DLIBDIR=\"$(libdir)\" \
        -I.. -I$(srcdir) \
        -I$(srcdir)/../common \
        -I$(srcdir)/../../include -I$(srcdir)/../../opcodes \

diff --git a/gprofng/src/envsets.cc b/gprofng/src/envsets.cc
index 484cbf839955a6a5e69d7bdedf7416bb7adb7b3a..c9838416638fe406fae0dc8485c3f7452d8493c3 100644 (file)
--- a/gprofng/src/envsets.cc
+++ b/gprofng/src/envsets.cc
@@ -159,12 +159,18 @@ collect::putenv_libcollector_ld_misc ()
   sb.appendf ("%s=", "SP_COLLECTOR_LIBRARY_PATH");
   int len = sb.length ();
   int cnt = 0;
+  char *fname = dbe_sprintf ("%s/%s/%s", LIBDIR, PACKAGE, LIBGP_COLLECTOR);
+  if (access (fname, R_OK | F_OK) == 0)
+    {
+      ++cnt;
+      sb.appendf ("%s/%s", LIBDIR, PACKAGE);
+    }
+  free (fname);
   for (char *s = ev; s;)
     {
       char *s1 = strchr (s, ':');
       if (s1)
        *(s1++) = 0;
-      char *fname;
       if (*s == '/')
        {
          fname = dbe_sprintf ("%s/%s/%s", s, PACKAGE, LIBGP_COLLECTOR);