proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 09:06:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6185 from opensourcerouting/build-assorted-20200408

Browse Source 
assorted build fixes
This commit is contained in:
Donald Sharp 2020-04-08 13:29:45 -04:00 committed by GitHub
commit c189a11d7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -860,7 +860,7 @@ fi
AC_SUBST([EXTRAVERSION]) AC_SUBST([EXTRAVERSION])
if test "$with_pkg_git_version" = "yes"; then if test "$with_pkg_git_version" = "yes"; then
if test -d "${srcdir}/.git"; then if test -e "${srcdir}/.git"; then
AC_DEFINE([GIT_VERSION], [1], [include git version info]) AC_DEFINE([GIT_VERSION], [1], [include git version info])
else with_pkg_git_version="no" else with_pkg_git_version="no"
AC_MSG_WARN([--with-pkg-git-version given, but this is not a git checkout]) AC_MSG_WARN([--with-pkg-git-version given, but this is not a git checkout])

2
tests/subdir.am
View File

@ -90,6 +90,7 @@ check_PROGRAMS += \
endif endif
tests/lib/cli/test_commands_defun.c: vtysh/vtysh_cmd.c tests/lib/cli/test_commands_defun.c: vtysh/vtysh_cmd.c
mkdir -p tests/lib/cli
sed \ sed \
-e 's%"vtysh/vtysh\.h"%"tests/helpers/c/tests.h"%' \ -e 's%"vtysh/vtysh\.h"%"tests/helpers/c/tests.h"%' \
-e 's/vtysh_init_cmd/test_init_cmd/' \ -e 's/vtysh_init_cmd/test_init_cmd/' \
@ -99,6 +100,7 @@ tests/lib/cli/test_commands_defun.c: vtysh/vtysh_cmd.c
CLEANFILES += tests/lib/cli/test_commands_defun.c CLEANFILES += tests/lib/cli/test_commands_defun.c
tests/isisd/test_fuzz_isis_tlv_tests.h: $(top_srcdir)/tests/isisd/test_fuzz_isis_tlv_tests.h.gz tests/isisd/test_fuzz_isis_tlv_tests.h: $(top_srcdir)/tests/isisd/test_fuzz_isis_tlv_tests.h.gz
mkdir -p tests/isisd
gzip -d < $(top_srcdir)/tests/isisd/test_fuzz_isis_tlv_tests.h.gz > "$@" gzip -d < $(top_srcdir)/tests/isisd/test_fuzz_isis_tlv_tests.h.gz > "$@"
CLEANFILES += tests/isisd/test_fuzz_isis_tlv_tests.h CLEANFILES += tests/isisd/test_fuzz_isis_tlv_tests.h

9
yang/embedmodel.py
View File

@ -3,11 +3,18 @@
# YANG module to C wrapper # YANG module to C wrapper
# written 2018 by David Lamparter, placed in Public Domain. # written 2018 by David Lamparter, placed in Public Domain.
import sys, string, re import sys
import os
import string
import re
inname = sys.argv[1] inname = sys.argv[1]
outname = sys.argv[2] outname = sys.argv[2]
outdir = os.path.dirname(os.path.abspath(outname))
if not os.path.isdir(outdir):
os.makedirs(outdir)
# these are regexes to avoid a compile-time/host dependency on yang-tools # these are regexes to avoid a compile-time/host dependency on yang-tools
# or python-yang. Cross-compiling FRR is already somewhat involved, no need # or python-yang. Cross-compiling FRR is already somewhat involved, no need
# to make it even harder. # to make it even harder.