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

Merge pull request #13239 from opensourcerouting/fix/enable_scripting_for_docker_alpine_build

Browse Source 
docker: Fix --enable-scripting for Docker images
This commit is contained in:
Jafar Al-Gharaibeh 2023-04-10 11:29:20 -05:00 committed by GitHub
commit 8b985768bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
alpine/APKBUILD.in
View File

@ -18,7 +18,8 @@ makedepends="ncurses-dev net-snmp-dev gawk texinfo perl
ncurses-libs ncurses-terminfo ncurses-terminfo-base patch pax-utils pcre2 ncurses-libs ncurses-terminfo ncurses-terminfo-base patch pax-utils pcre2
perl pkgconf python3 python3-dev readline readline-dev sqlite-libs pcre2-dev perl pkgconf python3 python3-dev readline readline-dev sqlite-libs pcre2-dev
squashfs-tools sudo tar texinfo xorriso xz-libs py-pip rtrlib rtrlib-dev squashfs-tools sudo tar texinfo xorriso xz-libs py-pip rtrlib rtrlib-dev
py3-sphinx elfutils elfutils-dev libyang-dev protobuf-c-compiler protobuf-c-dev" py3-sphinx elfutils elfutils-dev libyang-dev protobuf-c-compiler protobuf-c-dev
lua5.3-dev lua5.3"
checkdepends="pytest py-setuptools" checkdepends="pytest py-setuptools"
install="$pkgname.pre-install $pkgname.pre-deinstall $pkgname.post-deinstall" install="$pkgname.pre-install $pkgname.pre-deinstall $pkgname.post-deinstall"
subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg" subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg"
@ -47,7 +48,8 @@ build() {
--enable-vty-group=frrvty \ --enable-vty-group=frrvty \
--enable-user=$_user \ --enable-user=$_user \
--enable-group=$_user \ --enable-group=$_user \
--enable-pcre2posix --enable-pcre2posix \
--enable-scripting
make -j $(nproc) make -j $(nproc)
} }

16
configure.ac
View File

@ -299,14 +299,20 @@ if test "$enable_scripting" = "yes"; then
AX_LUA_HEADERS([], [ AX_LUA_HEADERS([], [
AC_MSG_ERROR([Lua 5.3 headers are required to build with Lua support. No other version is supported.]) AC_MSG_ERROR([Lua 5.3 headers are required to build with Lua support. No other version is supported.])
]) ])
AX_LUA_LIBS([ PKG_CHECK_MODULES([LUA], [lua5.3], [
AC_DEFINE([HAVE_SCRIPTING], [1], [Have support for scripting]) AC_DEFINE([HAVE_SCRIPTING], [1], [Have support for scripting])
LIBS="$LIBS $LUA_LIB" LIBS="$LIBS $LUA_LIBS"
SCRIPTING=true SCRIPTING=true
], [ ], [
SCRIPTING=false AX_LUA_LIBS([
AC_MSG_ERROR([Lua 5.3 libraries are required to build with Lua support. No other version is supported.]) AC_DEFINE([HAVE_SCRIPTING], [1], [Have support for scripting])
]) LIBS="$LIBS $LUA_LIB"
SCRIPTING=true
], [
SCRIPTING=false
AC_MSG_ERROR([Lua 5.3 libraries are required to build with Lua support. No other version is supported.])
])
])
fi fi
dnl the following flags go in CFLAGS rather than AC_CFLAGS since they make dnl the following flags go in CFLAGS rather than AC_CFLAGS since they make

2
tests/lib/subdir.am
View File

@ -15,7 +15,7 @@ tests_lib_test_frrscript_CFLAGS = $(TESTS_CFLAGS)
tests_lib_test_frrscript_CPPFLAGS = $(TESTS_CPPFLAGS) tests_lib_test_frrscript_CPPFLAGS = $(TESTS_CPPFLAGS)
tests_lib_test_frrscript_LDADD = $(ALL_TESTS_LDADD) tests_lib_test_frrscript_LDADD = $(ALL_TESTS_LDADD)
tests_lib_test_frrscript_SOURCES = tests/lib/test_frrscript.c tests_lib_test_frrscript_SOURCES = tests/lib/test_frrscript.c
EXTRA_DIST += tests/lib/test_frrscript.py EXTRA_DIST += tests/lib/test_frrscript.py tests/lib/script1.lua
############################################################################## ##############################################################################