laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741 ) Change subject: build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv ...................................................................... build: fix linking gen__pfcp_ies_auto to use build-tree libosmo-gtlv By moving *_LIBS to libosmo_pfcp_la_LIBADD, fix linking of gen__pfcp_ies_auto to prefer the locally built libosmo-gtlv over a system installed one. Related: OS#5942 Change-Id: I2e92238b214d8e79bab1095d6093139bad05bc66 --- M src/libosmo-pfcp/Makefile.am 1 file changed, 20 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libosmo-pfcp/Makefile.am b/src/libosmo-pfcp/Makefile.am index 123aff3..a26d5b2 100644 --- a/src/libosmo-pfcp/Makefile.am +++ b/src/libosmo-pfcp/Makefile.am @@ -11,11 +11,6 @@ $(LIBOSMOGSM_CFLAGS) \ $(NULL) -AM_LDFLAGS = \ - $(LIBOSMOCORE_LIBS) \ - $(LIBOSMOGSM_LIBS) \ - $(NULL) - lib_LTLIBRARIES = \ libosmo-pfcp.la \ $(NULL) @@ -30,6 +25,12 @@ pfcp_ies_auto.c \ $(NULL) +libosmo_pfcp_la_LIBADD = \ + $(top_builddir)/src/libosmo-gtlv/libosmo-gtlv.la \ + $(LIBOSMOCORE_LIBS) \ + $(LIBOSMOGSM_LIBS) \ + $(NULL) + # This is _NOT_ the library release version, it's an API version. # Please read Chapter 6 "Library interface versions" of the libtool # documentation before making any modification -- To view, visit https://gerrit.osmocom.org/c/libosmo-pfcp/+/31741 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-pfcp Gerrit-Branch: master Gerrit-Change-Id: I2e92238b214d8e79bab1095d6093139bad05bc66 Gerrit-Change-Number: 31741 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged