MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PKG_CHECK_MODULES: Properly check if $pkg_cv_[]$1[]_LIBS works

Browse Source 
There is no need to check $pkg_cv_[]$1[]_LIBS works if package check
failed.

config/

	PR binutils/26301
	* pkg.m4 (PKG_CHECK_MODULES): Use AC_TRY_LINK only if
	$pkg_failed = no.

binutils/

	PR binutils/26301
	* configure: Regenerated.

gdb/

	PR binutils/26301
	* configure: Regenerated.
This commit is contained in:
H.J. Lu 2020-07-28 06:59:20 -07:00
parent 866b34a12d
commit 377170fa31
6 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binutils/ChangeLog
View File

@ -3,6 +3,11 @@
PR binutils/26301 PR binutils/26301
* configure: Regenerated. * configure: Regenerated.
2020-07-28 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/26301
* configure: Regenerated.
2020-07-27 Alan Modra <amodra@gmail.com> 2020-07-27 Alan Modra <amodra@gmail.com>
* objdump.c (dump_section): Don't return without calling * objdump.c (dump_section): Don't return without calling

14
binutils/configure vendored
View File

@ -12439,27 +12439,29 @@ fi
pkg_failed=untried pkg_failed=untried
fi fi
pkg_save_LDFLAGS="$LDFLAGS" if test $pkg_failed = no; then
LDFLAGS="$LDFLAGS $pkg_cv_DEBUGINFOD_LIBS" pkg_save_LDFLAGS="$LDFLAGS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext LDFLAGS="$LDFLAGS $pkg_cv_DEBUGINFOD_LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
int int
main () main ()
{ {
return 0;
; ;
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
pkg_failed=no
else else
pkg_failed=yes pkg_failed=yes
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$pkg_save_LDFLAGS LDFLAGS=$pkg_save_LDFLAGS
fi

6
config/ChangeLog
View File

@ -1,3 +1,9 @@
2020-07-28 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/26301
* pkg.m4 (PKG_CHECK_MODULES): Use AC_TRY_LINK only if
$pkg_failed = no.
2020-07-28 H.J. Lu <hongjiu.lu@intel.com> 2020-07-28 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/26301 PR binutils/26301

10
config/pkg.m4
View File

@ -148,10 +148,12 @@ _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
_PKG_CONFIG([$1][_LIBS], [libs], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2])
dnl Check whether $pkg_cv_[]$1[]_LIBS works. dnl Check whether $pkg_cv_[]$1[]_LIBS works.
pkg_save_LDFLAGS="$LDFLAGS" if test $pkg_failed = no; then
LDFLAGS="$LDFLAGS $pkg_cv_[]$1[]_LIBS" pkg_save_LDFLAGS="$LDFLAGS"
AC_TRY_LINK([],[return 0;], [pkg_failed=no], [pkg_failed=yes]) LDFLAGS="$LDFLAGS $pkg_cv_[]$1[]_LIBS"
LDFLAGS=$pkg_save_LDFLAGS AC_TRY_LINK([],[], [], [pkg_failed=yes])
LDFLAGS=$pkg_save_LDFLAGS
fi
m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
and $1[]_LIBS to avoid the need to call pkg-config. and $1[]_LIBS to avoid the need to call pkg-config.

5
gdb/ChangeLog
View File

@ -3,6 +3,11 @@
PR binutils/26301 PR binutils/26301
* configure: Regenerated. * configure: Regenerated.
2020-07-28 H.J. Lu <hongjiu.lu@intel.com>
PR binutils/26301
* configure: Regenerated.
2020-07-28 Andrew Burgess <andrew.burgess@embecosm.com> 2020-07-28 Andrew Burgess <andrew.burgess@embecosm.com>
* python/py-frame.c: Remove 'user-regs.h' include. * python/py-frame.c: Remove 'user-regs.h' include.

14
gdb/configure vendored
View File

@ -7037,27 +7037,29 @@ fi
pkg_failed=untried pkg_failed=untried
fi fi
pkg_save_LDFLAGS="$LDFLAGS" if test $pkg_failed = no; then
LDFLAGS="$LDFLAGS $pkg_cv_DEBUGINFOD_LIBS" pkg_save_LDFLAGS="$LDFLAGS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext LDFLAGS="$LDFLAGS $pkg_cv_DEBUGINFOD_LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
int int
main () main ()
{ {
return 0;
; ;
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO"; then : if ac_fn_c_try_link "$LINENO"; then :
pkg_failed=no
else else
pkg_failed=yes pkg_failed=yes
fi fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$pkg_save_LDFLAGS LDFLAGS=$pkg_save_LDFLAGS
fi