osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-dev/+/33804 )

Change subject: ttcn3: build osmo-ggsn with --enable-gtp-linux ......................................................................

ttcn3: build osmo-ggsn with --enable-gtp-linux

Order the opts files alphabetically while at it.

Change-Id: I40c197fc0dc2199dd5a7b0d1d820dee1338c1703 --- A gtp_linux.opts M ttcn3/ttcn3.sh 2 files changed, 36 insertions(+), 2 deletions(-)

Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved; Verified

diff --git a/gtp_linux.opts b/gtp_linux.opts new file mode 100644 index 0000000..67f0840 --- /dev/null +++ b/gtp_linux.opts @@ -0,0 +1 @@ +osmo-ggsn --enable-gtp-linux diff --git a/ttcn3/ttcn3.sh b/ttcn3/ttcn3.sh index b87d28d..99500cf 100755 --- a/ttcn3/ttcn3.sh +++ b/ttcn3/ttcn3.sh @@ -81,6 +81,13 @@ esac }

+# Dependencies not mentioned in all.deps +get_extra_libraries() { + case "$PROJECT" in + ggsn) echo "libgtpnl" ;; # needed for --enable-gtp-linux + esac +} + # Programs that need to be built get_programs() { case "$PROJECT" in @@ -123,11 +130,12 @@

./gen_makefile.py \ default.opts \ + gtp_linux.opts \ iu.opts \ - no_systemd.opts \ - no_doxygen.opts \ no_dahdi.opts \ + no_doxygen.opts \ no_optimization.opts \ + no_systemd.opts \ ttcn3/ttcn3.opts \ werror.opts \ --docker-cmd "$docker_cmd" \ @@ -223,6 +231,19 @@ make -C "$testsuite_dir" }

+# Use osmo-dev to build libraries not mentioned in all.deps, for example the +# libgtpnl dependency of osmo-ggsn that is only needed with --enable-gtp-linux. +build_extra_libraries() { + local library + local libraries="$(get_extra_libraries)" + + for library in $libraries; do + set -x + make -C "$DIR_MAKE" "$library" + set +x + done +} + # Use osmo-dev to build one Osmocom program and its dependencies build_osmo_programs() { local program @@ -346,6 +367,7 @@ check_dir_testsuite prepare_local_bin prepare_docker_build_container +build_extra_libraries build_osmo_programs prepare_docker_testsuite_container build_testsuite