From 0e5f438cdc1b230d1507bb7cb7f08336d43feba5 Mon Sep 17 00:00:00 2001 From: Sukchan Lee Date: Wed, 27 Oct 2021 15:23:09 +0900 Subject: [PATCH] fix the meson 0.60 build error (#1213) --- configs/310014.yaml.in | 8 ++++---- configs/csfb.yaml.in | 8 ++++---- configs/non3gpp.yaml.in | 8 ++++---- configs/sample.yaml.in | 8 ++++---- configs/slice.yaml.in | 8 ++++---- configs/srslte.yaml.in | 8 ++++---- configs/volte.yaml.in | 8 ++++---- configs/vonr.yaml.in | 8 ++++---- tests/non3gpp/test-fd-path.c | 3 ++- tests/volte/test-fd-path.c | 3 ++- 10 files changed, 36 insertions(+), 34 deletions(-) diff --git a/configs/310014.yaml.in b/configs/310014.yaml.in index 90919c622..35b5e3b2f 100644 --- a/configs/310014.yaml.in +++ b/configs/310014.yaml.in @@ -33,7 +33,7 @@ mme: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: hss.localdomain addr: 127.0.0.8 @@ -100,7 +100,7 @@ smf: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: pcrf.localdomain addr: 127.0.0.9 @@ -164,7 +164,7 @@ hss: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: mme.localdomain addr: 127.0.0.2 @@ -182,7 +182,7 @@ pcrf: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: smf.localdomain addr: 127.0.0.4 diff --git a/configs/csfb.yaml.in b/configs/csfb.yaml.in index 3adb8d552..90079484a 100644 --- a/configs/csfb.yaml.in +++ b/configs/csfb.yaml.in @@ -33,7 +33,7 @@ mme: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: hss.localdomain addr: 127.0.0.8 @@ -134,7 +134,7 @@ smf: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: pcrf.localdomain addr: 127.0.0.9 @@ -198,7 +198,7 @@ hss: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: mme.localdomain addr: 127.0.0.2 @@ -216,7 +216,7 @@ pcrf: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: smf.localdomain addr: 127.0.0.4 diff --git a/configs/non3gpp.yaml.in b/configs/non3gpp.yaml.in index b223812bf..02a8a2ae8 100644 --- a/configs/non3gpp.yaml.in +++ b/configs/non3gpp.yaml.in @@ -33,7 +33,7 @@ mme: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: hss.localdomain addr: 127.0.0.8 @@ -100,7 +100,7 @@ smf: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: pcrf.localdomain addr: 127.0.0.9 @@ -166,7 +166,7 @@ hss: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: mme.localdomain addr: 127.0.0.2 @@ -186,7 +186,7 @@ pcrf: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: smf.localdomain addr: 127.0.0.4 diff --git a/configs/sample.yaml.in b/configs/sample.yaml.in index 0800ee3b4..ddc58a039 100644 --- a/configs/sample.yaml.in +++ b/configs/sample.yaml.in @@ -33,7 +33,7 @@ mme: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: hss.localdomain addr: 127.0.0.8 @@ -100,7 +100,7 @@ smf: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: pcrf.localdomain addr: 127.0.0.9 @@ -164,7 +164,7 @@ hss: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: mme.localdomain addr: 127.0.0.2 @@ -182,7 +182,7 @@ pcrf: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: smf.localdomain addr: 127.0.0.4 diff --git a/configs/slice.yaml.in b/configs/slice.yaml.in index a177901da..fdef86000 100644 --- a/configs/slice.yaml.in +++ b/configs/slice.yaml.in @@ -33,7 +33,7 @@ mme: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: hss.localdomain addr: 127.0.0.8 @@ -100,7 +100,7 @@ smf: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: pcrf.localdomain addr: 127.0.0.9 @@ -168,7 +168,7 @@ hss: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: mme.localdomain addr: 127.0.0.2 @@ -186,7 +186,7 @@ pcrf: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: smf.localdomain addr: 127.0.0.4 diff --git a/configs/srslte.yaml.in b/configs/srslte.yaml.in index 1dec96467..cc7216bb1 100644 --- a/configs/srslte.yaml.in +++ b/configs/srslte.yaml.in @@ -33,7 +33,7 @@ mme: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: hss.localdomain addr: 127.0.0.8 @@ -100,7 +100,7 @@ smf: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: pcrf.localdomain addr: 127.0.0.9 @@ -164,7 +164,7 @@ hss: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: mme.localdomain addr: 127.0.0.2 @@ -182,7 +182,7 @@ pcrf: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: smf.localdomain addr: 127.0.0.4 diff --git a/configs/volte.yaml.in b/configs/volte.yaml.in index 169c35721..2654a2621 100644 --- a/configs/volte.yaml.in +++ b/configs/volte.yaml.in @@ -33,7 +33,7 @@ mme: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: hss.localdomain addr: 127.0.0.8 @@ -103,7 +103,7 @@ smf: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: pcrf.localdomain addr: 127.0.0.9 @@ -167,7 +167,7 @@ hss: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: mme.localdomain addr: 127.0.0.2 @@ -187,7 +187,7 @@ pcrf: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: smf.localdomain addr: 127.0.0.4 diff --git a/configs/vonr.yaml.in b/configs/vonr.yaml.in index 08231e5fe..2cd414dbf 100644 --- a/configs/vonr.yaml.in +++ b/configs/vonr.yaml.in @@ -33,7 +33,7 @@ mme: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: hss.localdomain addr: 127.0.0.8 @@ -103,7 +103,7 @@ smf: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: pcrf.localdomain addr: 127.0.0.9 @@ -167,7 +167,7 @@ hss: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: mme.localdomain addr: 127.0.0.2 @@ -185,7 +185,7 @@ pcrf: - module: @freediameter_extensions_builddir@/dict_nasreq.fdx - module: @freediameter_extensions_builddir@/dict_nas_mipv6.fdx - module: @freediameter_extensions_builddir@/dict_dcca.fdx - - module: @freediameter_extensions_builddir@/dict_dcca_3gpp.fdx + - module: @freediameter_extensions_builddir@/dict_dcca_3gpp/dict_dcca_3gpp.fdx connect: - identity: smf.localdomain addr: 127.0.0.4 diff --git a/tests/non3gpp/test-fd-path.c b/tests/non3gpp/test-fd-path.c index d5a850315..e54bbd9e9 100644 --- a/tests/non3gpp/test-fd-path.c +++ b/tests/non3gpp/test-fd-path.c @@ -54,7 +54,8 @@ static void test_diam_config(void) FD_EXT_DIR OGS_DIR_SEPARATOR_S "dict_dcca.fdx"; diam_config.num_of_ext++; diam_config.ext[diam_config.num_of_ext].module = - FD_EXT_DIR OGS_DIR_SEPARATOR_S "dict_dcca_3gpp.fdx"; + FD_EXT_DIR OGS_DIR_SEPARATOR_S "dict_dcca_3gpp" \ + OGS_DIR_SEPARATOR_S "dict_dcca_3gpp.fdx"; diam_config.num_of_ext++; diam_config.conn[diam_config.num_of_conn].identity = TEST_HSS_IDENTITY; diff --git a/tests/volte/test-fd-path.c b/tests/volte/test-fd-path.c index c1fd5a896..31ed3bfae 100644 --- a/tests/volte/test-fd-path.c +++ b/tests/volte/test-fd-path.c @@ -54,7 +54,8 @@ static void test_diam_config(void) FD_EXT_DIR OGS_DIR_SEPARATOR_S "dict_dcca.fdx"; diam_config.num_of_ext++; diam_config.ext[diam_config.num_of_ext].module = - FD_EXT_DIR OGS_DIR_SEPARATOR_S "dict_dcca_3gpp.fdx"; + FD_EXT_DIR OGS_DIR_SEPARATOR_S "dict_dcca_3gpp" \ + OGS_DIR_SEPARATOR_S "dict_dcca_3gpp.fdx"; diam_config.num_of_ext++; diam_config.conn[diam_config.num_of_conn].identity = TEST_HSS_IDENTITY;