PKG_CHECK_MODULES: Check if $pkg_cv_[]$1[]_LIBS works

It is quite normal to have headers without library on multilib OSes.
Add AC_TRY_LINK to PKG_CHECK_MODULES to check if $pkg_cv_[]$1[]_LIBS
works.

config/

	PR binutils/26301
	* pkg.m4 (PKG_CHECK_MODULES): Add AC_TRY_LINK to check if
	$pkg_cv_[]$1[]_LIBS works.

binutils/

	PR binutils/26301
	* configure: Regenerated.

gdb/

	PR binutils/26301
	* configure: Regenerated.

diff --git a/ChangeLog b/ChangeLog
index aca3f52cdb3bf162d7120b570f0694bd2e7c28cf..3e0e274ba31f6384f247e96feadf44c0b4c4b245 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,5 @@
 2020-07-24  Aaron Merey  <amerey@redhat.com>
 
-       * config/debuginfod.m4: use PKG_CHECK_MODULES.
-       * config/pkg.m4: New file.
        * configure: Rebuild.
        * configure.ac: Remove AC_DEBUGINFOD.
 

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 2522808763a44ce835298c2bc385702af4d84569..2c76b2aab0d7aa1cb7b288f69c2ee46994fecf30 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2020-07-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR binutils/26301
+       * configure: Regenerated.
+
 2020-07-27  Alan Modra  <amodra@gmail.com>
 
        * objdump.c (dump_section): Don't return without calling

diff --git a/binutils/configure b/binutils/configure
index c9fc5108e02806bbc1e71848bbdc9e7e3fdd8c76..4620a6b105d84f793d9c1caf158df3fe98427662 100755 (executable)
--- a/binutils/configure
+++ b/binutils/configure
@@ -12439,6 +12439,28 @@ fi
     pkg_failed=untried
 fi
 
+pkg_save_LDFLAGS="$LDFLAGS"
+LDFLAGS="$LDFLAGS $pkg_cv_DEBUGINFOD_LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  pkg_failed=no
+else
+  pkg_failed=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LDFLAGS=$pkg_save_LDFLAGS
+
 
 
 if test $pkg_failed = yes; then

diff --git a/config/ChangeLog b/config/ChangeLog
index 12795fc4973aa11cd525fa8903bd6d8ebbfc2923..2cd61774cf141312d74f7e0c276553f66d60b338 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,14 @@
+2020-07-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR binutils/26301
+       * pkg.m4 (PKG_CHECK_MODULES): Add AC_TRY_LINK to check if
+       $pkg_cv_[]$1[]_LIBS works.
+
+2020-07-24  Aaron Merey  <amerey@redhat.com>
+
+       * debuginfod.m4: use PKG_CHECK_MODULES.
+       * pkg.m4: New file.
+
 2020-07-04  Nick Clifton  <nickc@redhat.com>
 
        Binutils 2.35 branch created.

diff --git a/config/pkg.m4 b/config/pkg.m4
index 13a889017866a112bbf088864210d7ada61b5682..45587e97c8b41026340d57f8638e6d5f019cb596 100644 (file)
--- a/config/pkg.m4
+++ b/config/pkg.m4
@@ -147,6 +147,12 @@ AC_MSG_CHECKING([for $2])
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
 
+dnl Check whether $pkg_cv_[]$1[]_LIBS works.
+pkg_save_LDFLAGS="$LDFLAGS"
+LDFLAGS="$LDFLAGS $pkg_cv_[]$1[]_LIBS"
+AC_TRY_LINK([],[return 0;], [pkg_failed=no], [pkg_failed=yes])
+LDFLAGS=$pkg_save_LDFLAGS
+
 m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
 and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 234dc2407864a73bec9dae65e4aedf79c50d764b..defca83c2637d0d736c87ed17a34edc73fc673ce 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-07-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR binutils/26301
+       * configure: Regenerated.
+
 2020-07-28  Andrew Burgess  <andrew.burgess@embecosm.com>
 
        * python/py-frame.c: Remove 'user-regs.h' include.

diff --git a/gdb/configure b/gdb/configure
index adcfa49c633d50e3cfef75bf630d80575c083451..eb38aaacfcaf55023f4c4e78fcef0280222371ca 100755 (executable)
--- a/gdb/configure
+++ b/gdb/configure
@@ -7037,6 +7037,28 @@ fi
     pkg_failed=untried
 fi
 
+pkg_save_LDFLAGS="$LDFLAGS"
+LDFLAGS="$LDFLAGS $pkg_cv_DEBUGINFOD_LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  pkg_failed=no
+else
+  pkg_failed=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LDFLAGS=$pkg_save_LDFLAGS
+
 
 
 if test $pkg_failed = yes; then