proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 21:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5704 from opensourcerouting/build-cleanup-20200117

Browse Source 
build: random cleanups
This commit is contained in:
Donald Sharp 2020-01-18 12:09:45 -05:00 committed by GitHub
commit 50d5de4880
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
configure.ac
View File

@ -30,7 +30,7 @@ build_clippy="true"
dnl case 1: external clippy dnl case 1: external clippy
if test -n "$with_clippy" -a "$with_clippy" != "no" -a "$with_clippy" != "yes"; then if test -n "$with_clippy" -a "$with_clippy" != "no" -a "$with_clippy" != "yes"; then
if test "$enable_clippy_only" == "yes"; then if test "$enable_clippy_only" = "yes"; then
AC_MSG_ERROR([--enable-clippy-only does not make sense with --with-clippy]) AC_MSG_ERROR([--enable-clippy-only does not make sense with --with-clippy])
fi fi
@ -2113,6 +2113,19 @@ if test x"${enable_backtrace}" != x"no" ; then
AC_DEFINE([HAVE_LIBUNWIND], [1], [libunwind]) AC_DEFINE([HAVE_LIBUNWIND], [1], [libunwind])
backtrace_ok=yes backtrace_ok=yes
], [ ], [
true
])
if test "$backtrace_ok" = "no"; then
AC_CHECK_HEADER([unwind.h], [
AC_SEARCH_LIBS([unw_getcontext], [unwind], [
AC_DEFINE([HAVE_LIBUNWIND], [1], [libunwind])
backtrace_ok=yes
])
])
fi
if test "$backtrace_ok" = "no"; then
case "$host_os" in case "$host_os" in
sunos* | solaris2*) sunos* | solaris2*)
AC_CHECK_FUNCS([printstack], [ AC_CHECK_FUNCS([printstack], [
@ -2129,7 +2142,7 @@ if test x"${enable_backtrace}" != x"no" ; then
],, [-lm]) ],, [-lm])
]) ])
fi fi
]) fi
if test x"${enable_backtrace}" = x"yes" -a x"${backtrace_ok}" = x"no"; then if test x"${enable_backtrace}" = x"yes" -a x"${backtrace_ok}" = x"no"; then
dnl user explicitly requested backtrace but we failed to find support dnl user explicitly requested backtrace but we failed to find support

2
lib/gitversion.pl
View File

@ -6,7 +6,7 @@ chdir $dir || die "$dir: $!\n";
my $gitdesc = `git describe --always --first-parent --tags --dirty --match 'frr-*' || echo -- \"0-gUNKNOWN\"`; my $gitdesc = `git describe --always --first-parent --tags --dirty --match 'frr-*' || echo -- \"0-gUNKNOWN\"`;
chomp $gitdesc; chomp $gitdesc;
my $gitsuffix = ($gitdesc =~ /([0-9a-fA-F]{7}(-dirty)?)$/) ? "-g$1" : "-gUNKNOWN"; my $gitsuffix = ($gitdesc =~ /-g([0-9a-fA-F]+(-dirty)?)$/) ? "-g$1" : "-gUNKNOWN";
printf STDERR "git suffix: %s\n", $gitsuffix; printf STDERR "git suffix: %s\n", $gitsuffix;
printf "#define GIT_SUFFIX \"%s\"\n", $gitsuffix; printf "#define GIT_SUFFIX \"%s\"\n", $gitsuffix;

2
m4/ax_python.m4
View File

@ -186,7 +186,7 @@ AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
PYTHON_CFLAGS="`\"$pycfg\" --includes`" PYTHON_CFLAGS="`\"$pycfg\" --includes`"
if test x"${py_ver}" == x"3.8" || test x"{py_ver}" == x"3.9"; then if test x"${py_ver}" = x"3.8" || test x"{py_ver}" = x"3.9"; then
PYTHON_LIBS="`\"$pycfg\" --ldflags --embed`" PYTHON_LIBS="`\"$pycfg\" --ldflags --embed`"
else else
PYTHON_LIBS="`\"$pycfg\" --ldflags`" PYTHON_LIBS="`\"$pycfg\" --ldflags`"