This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
Neels Hofmeyr gerrit-no-reply at lists.osmocom.orgNeels Hofmeyr has submitted this change and it was merged. Change subject: am: msc_vlr_tests: use AM_LDFLAGS instead of COMMON vars ...................................................................... am: msc_vlr_tests: use AM_LDFLAGS instead of COMMON vars It was a n00b mistake to define COMMON_LDFLAGS and COMMON_LDADD to pass the same linker options to each test binary. Instead, use AM_LDFLAGS and remove the autoreconf warning. tests/msc_vlr/Makefile.am:66: warning: variable 'COMMON_LDFLAGS' is defined but no program or tests/msc_vlr/Makefile.am:66: library has 'COMMON' as canonical name (possible typo) Related: OS#2448 Change-Id: I6efae6e192b22de2c1d706edd55385135142532b --- M tests/msc_vlr/Makefile.am 1 file changed, 32 insertions(+), 53 deletions(-) Approvals: Max: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am index 70006dd..fb4857f 100644 --- a/tests/msc_vlr/Makefile.am +++ b/tests/msc_vlr/Makefile.am @@ -18,6 +18,38 @@ $(LIBOSMOLEGACYMGCP_CFLAGS) \ $(NULL) +AM_LDFLAGS = \ + -Wl,--wrap=gsup_client_create \ + -Wl,--wrap=gsup_client_send \ + -Wl,--wrap=a_iface_tx_dtap \ + -Wl,--wrap=a_iface_tx_clear_cmd \ + -Wl,--wrap=a_iface_tx_paging \ + -Wl,--wrap=ranap_iu_tx \ + -Wl,--wrap=ranap_iu_tx_release \ + -Wl,--wrap=ranap_iu_tx_common_id \ + -Wl,--wrap=ranap_iu_page_cs \ + -Wl,--wrap=msc_stop_paging \ + -Wl,--wrap=gsm340_gen_scts \ + -Wl,--wrap=RAND_bytes \ + $(top_builddir)/src/libmsc/libmsc.a \ + $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ + $(top_builddir)/src/libvlr/libvlr.a \ + $(top_builddir)/src/libcommon/libcommon.a \ + $(LIBSMPP34_LIBS) \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(LIBCRYPTO_LIBS) \ + $(LIBOSMOVTY_LIBS) \ + $(LIBOSMOABIS_LIBS) \ + $(LIBOSMOSIGTRAN_LIBS) \ + $(LIBOSMORANAP_LIBS) \ + $(LIBASN1C_LIBS) \ + $(LIBOSMOLEGACYMGCP_LIBS) \ + $(LIBRARY_GSM) \ + -ldbi \ + -lrt \ + $(NULL) + noinst_HEADERS = \ msc_vlr_tests.h \ $(NULL) @@ -43,41 +75,6 @@ msc_vlr_test_rest.err \ $(NULL) -COMMON_LDADD = \ - $(top_builddir)/src/libmsc/libmsc.a \ - $(top_builddir)/src/libcommon-cs/libcommon-cs.a \ - $(top_builddir)/src/libvlr/libvlr.a \ - $(top_builddir)/src/libcommon/libcommon.a \ - $(LIBSMPP34_LIBS) \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(LIBCRYPTO_LIBS) \ - $(LIBOSMOVTY_LIBS) \ - $(LIBOSMOABIS_LIBS) \ - $(LIBOSMOSIGTRAN_LIBS) \ - $(LIBOSMORANAP_LIBS) \ - $(LIBASN1C_LIBS) \ - $(LIBOSMOLEGACYMGCP_LIBS) \ - $(LIBRARY_GSM) \ - -ldbi \ - -lrt \ - $(NULL) - -COMMON_LDFLAGS = \ - -Wl,--wrap=gsup_client_create \ - -Wl,--wrap=gsup_client_send \ - -Wl,--wrap=a_iface_tx_dtap \ - -Wl,--wrap=a_iface_tx_clear_cmd \ - -Wl,--wrap=a_iface_tx_paging \ - -Wl,--wrap=ranap_iu_tx \ - -Wl,--wrap=ranap_iu_tx_release \ - -Wl,--wrap=ranap_iu_tx_common_id \ - -Wl,--wrap=ranap_iu_page_cs \ - -Wl,--wrap=msc_stop_paging \ - -Wl,--wrap=gsm340_gen_scts \ - -Wl,--wrap=RAND_bytes \ - $(NULL) - noinst_PROGRAMS = \ msc_vlr_test_no_authen \ msc_vlr_test_gsm_authen \ @@ -94,64 +91,46 @@ msc_vlr_test_no_authen.c \ msc_vlr_tests.c \ $(NULL) -msc_vlr_test_no_authen_LDADD = $(COMMON_LDADD) -msc_vlr_test_no_authen_LDFLAGS = $(COMMON_LDFLAGS) msc_vlr_test_gsm_authen_SOURCES = \ msc_vlr_test_gsm_authen.c \ msc_vlr_tests.c \ $(NULL) -msc_vlr_test_gsm_authen_LDADD = $(COMMON_LDADD) -msc_vlr_test_gsm_authen_LDFLAGS = $(COMMON_LDFLAGS) msc_vlr_test_gsm_ciph_SOURCES = \ msc_vlr_test_gsm_ciph.c \ msc_vlr_tests.c \ $(NULL) -msc_vlr_test_gsm_ciph_LDADD = $(COMMON_LDADD) -msc_vlr_test_gsm_ciph_LDFLAGS = $(COMMON_LDFLAGS) msc_vlr_test_umts_authen_SOURCES = \ msc_vlr_test_umts_authen.c \ msc_vlr_tests.c \ $(NULL) -msc_vlr_test_umts_authen_LDADD = $(COMMON_LDADD) -msc_vlr_test_umts_authen_LDFLAGS = $(COMMON_LDFLAGS) msc_vlr_test_hlr_reject_SOURCES = \ msc_vlr_test_hlr_reject.c \ msc_vlr_tests.c \ $(NULL) -msc_vlr_test_hlr_reject_LDADD = $(COMMON_LDADD) -msc_vlr_test_hlr_reject_LDFLAGS = $(COMMON_LDFLAGS) msc_vlr_test_hlr_timeout_SOURCES = \ msc_vlr_test_hlr_timeout.c \ msc_vlr_tests.c \ $(NULL) -msc_vlr_test_hlr_timeout_LDADD = $(COMMON_LDADD) -msc_vlr_test_hlr_timeout_LDFLAGS = $(COMMON_LDFLAGS) msc_vlr_test_ms_timeout_SOURCES = \ msc_vlr_test_ms_timeout.c \ msc_vlr_tests.c \ $(NULL) -msc_vlr_test_ms_timeout_LDADD = $(COMMON_LDADD) -msc_vlr_test_ms_timeout_LDFLAGS = $(COMMON_LDFLAGS) msc_vlr_test_reject_concurrency_SOURCES = \ msc_vlr_test_reject_concurrency.c \ msc_vlr_tests.c \ $(NULL) -msc_vlr_test_reject_concurrency_LDADD = $(COMMON_LDADD) -msc_vlr_test_reject_concurrency_LDFLAGS = $(COMMON_LDFLAGS) msc_vlr_test_rest_SOURCES = \ msc_vlr_test_rest.c \ msc_vlr_tests.c \ $(NULL) -msc_vlr_test_rest_LDADD = $(COMMON_LDADD) -msc_vlr_test_rest_LDFLAGS = $(COMMON_LDFLAGS) .PHONY: update_exp update_exp: -- To view, visit https://gerrit.osmocom.org/3720 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6efae6e192b22de2c1d706edd55385135142532b Gerrit-PatchSet: 3 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max <msuraev at sysmocom.de> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>