diff --git a/Makefile.am b/Makefile.am index c56a551aa5..7f7d7d6236 100644 --- a/Makefile.am +++ b/Makefile.am @@ -226,8 +226,8 @@ noinst_HEADERS += defaults.h clean-local: clean-python .PHONY: clean-python clean-python: - find -name __pycache__ -o -name .pytest_cache | xargs rm -rf - find -name "*.pyc" -o -name "*_clippy.c" | xargs rm -f + find . -name __pycache__ -o -name .pytest_cache | xargs rm -rf + find . -name "*.pyc" -o -name "*_clippy.c" | xargs rm -f redistclean: $(MAKE) distclean CONFIG_CLEAN_FILES="$(filter-out $(EXTRA_DIST), $(CONFIG_CLEAN_FILES))" diff --git a/configure.ac b/configure.ac index abc1e8d15e..4a17b3686f 100755 --- a/configure.ac +++ b/configure.ac @@ -346,7 +346,7 @@ AM_CONDITIONAL([STATIC_BIN], [test "x$enable_static_bin" = "xyes"]) dnl $AR and $RANLIB are set by LT_INIT above AC_MSG_CHECKING([whether $AR supports D option]) -if $AR crD conftest.a; then +if $AR crD conftest.a >/dev/null 2>/dev/null; then AC_MSG_RESULT([yes]) dnl ARFLAGS is for automake, AR_FLAGS for libtool m-( ARFLAGS="crD" @@ -360,7 +360,7 @@ AC_SUBST([ARFLAGS]) AC_SUBST([AR_FLAGS]) AC_MSG_CHECKING([whether $RANLIB supports D option]) -if $RANLIB -D conftest.a; then +if $RANLIB -D conftest.a >/dev/null 2>/dev/null; then AC_MSG_RESULT([yes]) RANLIB="$RANLIB -D" else @@ -817,15 +817,17 @@ fi AM_CONDITIONAL([GIT_VERSION], [test "x$with_pkg_git_version" = "xyes"]) AC_CHECK_TOOL([OBJCOPY], [objcopy], [:]) -AC_CACHE_CHECK([for .interp value to use], [frr_cv_interp], [ - frr_cv_interp="" - AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])], [ - if $OBJCOPY -j.interp -Obinary conftest conftest.interp; then - frr_cv_interp="`xargs -0 echo < conftest.interp`" - fi - test -f conftest.interp && rm conftest.interp +if test "x${OBJCOPY}" != "x:"; then + AC_CACHE_CHECK([for .interp value to use], [frr_cv_interp], [ + frr_cv_interp="" + AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])], [ + if $OBJCOPY -j.interp -Obinary conftest conftest.interp; then + frr_cv_interp="`xargs -0 echo < conftest.interp`" + fi + test -f conftest.interp && rm conftest.interp + ]) ]) -]) +fi if test -n "$frr_cv_interp"; then AC_DEFINE_UNQUOTED([INTERP], ["$frr_cv_interp"], [.interp value]) fi diff --git a/lib/frr_pthread.c b/lib/frr_pthread.c index f964adfdbb..fe18eb1051 100644 --- a/lib/frr_pthread.c +++ b/lib/frr_pthread.c @@ -124,7 +124,7 @@ int frr_pthread_set_name(struct frr_pthread *fpt) #ifdef HAVE_PTHREAD_SETNAME_NP # ifdef GNU_LINUX ret = pthread_setname_np(fpt->thread, fpt->os_name); -# else /* NetBSD */ +# elif defined(__NetBSD__) ret = pthread_setname_np(fpt->thread, fpt->os_name, NULL); # endif #elif defined(HAVE_PTHREAD_SET_NAME_NP)