[MERGED] osmo-msc[master]: Add missing CFLAGS
Harald Welte has submitted this change and it was merged. Change subject: Add missing CFLAGS .. Add missing CFLAGS Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 --- M src/libcommon-cs/Makefile.am M src/libcommon/Makefile.am M src/libmsc/Makefile.am M src/libvlr/Makefile.am M src/utils/Makefile.am 5 files changed, 17 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libcommon-cs/Makefile.am b/src/libcommon-cs/Makefile.am index 21c2745..eada698 100644 --- a/src/libcommon-cs/Makefile.am +++ b/src/libcommon-cs/Makefile.am @@ -10,6 +10,8 @@ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) diff --git a/src/libcommon/Makefile.am b/src/libcommon/Makefile.am index 0b258c0..18272c5 100644 --- a/src/libcommon/Makefile.am +++ b/src/libcommon/Makefile.am @@ -10,6 +10,8 @@ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am index fee9f44..998df26 100644 --- a/src/libmsc/Makefile.am +++ b/src/libmsc/Makefile.am @@ -15,6 +15,7 @@ $(LIBASN1C_CFLAGS) \ $(LIBOSMOSIGTRAN_CFLAGS) \ $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(NULL) noinst_HEADERS = \ diff --git a/src/libvlr/Makefile.am b/src/libvlr/Makefile.am index 17ad411..511dfc0 100644 --- a/src/libvlr/Makefile.am +++ b/src/libvlr/Makefile.am @@ -1,6 +1,14 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) \ - $(COVERAGE_CFLAGS) $(LIBCRYPTO_CFLAGS) +AM_CFLAGS= \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(LIBCRYPTO_CFLAGS) \ + $(NULL) noinst_HEADERS = \ vlr_access_req_fsm.h \ diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 07b30d9..f1130db 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -123,5 +123,7 @@ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(NULL) -- To view, visit https://gerrit.osmocom.org/5138 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 Gerrit-PatchSet: 3 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-msc[master]: Add missing CFLAGS
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/5138 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 Gerrit-PatchSet: 2 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[PATCH] osmo-msc[master]: Add missing CFLAGS
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/5138 to look at the new patch set (#2). Add missing CFLAGS Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 --- M src/libcommon-cs/Makefile.am M src/libcommon/Makefile.am M src/libmsc/Makefile.am M src/libvlr/Makefile.am M src/utils/Makefile.am 5 files changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/38/5138/2 diff --git a/src/libcommon-cs/Makefile.am b/src/libcommon-cs/Makefile.am index 21c2745..eada698 100644 --- a/src/libcommon-cs/Makefile.am +++ b/src/libcommon-cs/Makefile.am @@ -10,6 +10,8 @@ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) diff --git a/src/libcommon/Makefile.am b/src/libcommon/Makefile.am index 0b258c0..18272c5 100644 --- a/src/libcommon/Makefile.am +++ b/src/libcommon/Makefile.am @@ -10,6 +10,8 @@ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am index fee9f44..998df26 100644 --- a/src/libmsc/Makefile.am +++ b/src/libmsc/Makefile.am @@ -15,6 +15,7 @@ $(LIBASN1C_CFLAGS) \ $(LIBOSMOSIGTRAN_CFLAGS) \ $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(NULL) noinst_HEADERS = \ diff --git a/src/libvlr/Makefile.am b/src/libvlr/Makefile.am index 17ad411..511dfc0 100644 --- a/src/libvlr/Makefile.am +++ b/src/libvlr/Makefile.am @@ -1,6 +1,14 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) \ - $(COVERAGE_CFLAGS) $(LIBCRYPTO_CFLAGS) +AM_CFLAGS= \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(LIBCRYPTO_CFLAGS) \ + $(NULL) noinst_HEADERS = \ vlr_access_req_fsm.h \ diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 07b30d9..f1130db 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -123,5 +123,7 @@ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(NULL) -- To view, visit https://gerrit.osmocom.org/5138 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 Gerrit-PatchSet: 2 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
osmo-msc[master]: Add missing CFLAGS
Patch Set 1: (2 comments) > (2 comments) https://gerrit.osmocom.org/#/c/5138/1/src/utils/Makefile.am File src/utils/Makefile.am: Line 12:$(LIBOSMOSCCP_CFLAGS) \ > which of the utilities needs SCCP? Correct, this is unneeded, I'll fix and resubmit. Line 127: $(LIBOSMOSCCP_CFLAGS) \ > for sure, meas_json doesn't need SCCP or MGCP, this is wrong. That's an indirect dependency via osmocom/msc/gsm_data.h. Without those CFLAGS the build (with previously described setup) fails with: CC meas_json-meas_json.o In file included from meas_json.c:40:0: ../../include/osmocom/msc/gsm_data.h:15:10: fatal error: osmocom/sigtran/sccp_sap.h: No such file or directory #include ^~~~ compilation terminated. or: CC meas_json-meas_json.o In file included from meas_json.c:40:0: ../../include/osmocom/msc/gsm_data.h:19:10: fatal error: osmocom/mgcp_client/mgcp_client.h: No such file or directory #include ^~~ compilation terminated. -- To view, visit https://gerrit.osmocom.org/5138 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: Yes
osmo-msc[master]: Add missing CFLAGS
Patch Set 1: Code-Review-1 (2 comments) https://gerrit.osmocom.org/#/c/5138/1/src/utils/Makefile.am File src/utils/Makefile.am: Line 12:$(LIBOSMOSCCP_CFLAGS) \ which of the utilities needs SCCP? Line 127: $(LIBOSMOSCCP_CFLAGS) \ for sure, meas_json doesn't need SCCP or MGCP, this is wrong. -- To view, visit https://gerrit.osmocom.org/5138 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: Yes
osmo-msc[master]: Add missing CFLAGS
Patch Set 1: > are we sure that the individual programs each actually use all of > the libraries you have listed in their CFLAGS now? We typically > don't list all libraries' CFLAGS for each of the programs/libraries. > We only do so, if they actually use definitions/symbols from that > library. Yes, all additions are based on actual build failures in my environment in which libraries are installed in distinct directories and then symlinked to a common one with GNU stow. Please see also https://gerrit.osmocom.org/#/c/2691 which would help in detecting such missing entries. -- To view, visit https://gerrit.osmocom.org/5138 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-msc[master]: Add missing CFLAGS
Patch Set 1: are we sure that the individual programs each actually use all of the libraries you have listed in their CFLAGS now? We typically don't list all libraries' CFLAGS for each of the programs/libraries. We only do so, if they actually use definitions/symbols from that library. -- To view, visit https://gerrit.osmocom.org/5138 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Alexander Huemer Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[PATCH] osmo-msc[master]: Add missing CFLAGS
Review at https://gerrit.osmocom.org/5138 Add missing CFLAGS Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 --- M src/libcommon-cs/Makefile.am M src/libcommon/Makefile.am M src/libmsc/Makefile.am M src/libvlr/Makefile.am M src/utils/Makefile.am 5 files changed, 18 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/38/5138/1 diff --git a/src/libcommon-cs/Makefile.am b/src/libcommon-cs/Makefile.am index 21c2745..eada698 100644 --- a/src/libcommon-cs/Makefile.am +++ b/src/libcommon-cs/Makefile.am @@ -10,6 +10,8 @@ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) diff --git a/src/libcommon/Makefile.am b/src/libcommon/Makefile.am index 0b258c0..18272c5 100644 --- a/src/libcommon/Makefile.am +++ b/src/libcommon/Makefile.am @@ -10,6 +10,8 @@ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOVTY_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(NULL) diff --git a/src/libmsc/Makefile.am b/src/libmsc/Makefile.am index fee9f44..998df26 100644 --- a/src/libmsc/Makefile.am +++ b/src/libmsc/Makefile.am @@ -15,6 +15,7 @@ $(LIBASN1C_CFLAGS) \ $(LIBOSMOSIGTRAN_CFLAGS) \ $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(NULL) noinst_HEADERS = \ diff --git a/src/libvlr/Makefile.am b/src/libvlr/Makefile.am index 17ad411..511dfc0 100644 --- a/src/libvlr/Makefile.am +++ b/src/libvlr/Makefile.am @@ -1,6 +1,14 @@ AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) -AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOVTY_CFLAGS) \ - $(COVERAGE_CFLAGS) $(LIBCRYPTO_CFLAGS) +AM_CFLAGS= \ + -Wall \ + $(LIBOSMOCORE_CFLAGS) \ + $(LIBOSMOVTY_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ + $(LIBOSMOABIS_CFLAGS) \ + $(COVERAGE_CFLAGS) \ + $(LIBCRYPTO_CFLAGS) \ + $(NULL) noinst_HEADERS = \ vlr_access_req_fsm.h \ diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am index 07b30d9..56b9356 100644 --- a/src/utils/Makefile.am +++ b/src/utils/Makefile.am @@ -9,6 +9,7 @@ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(SQLITE3_CFLAGS) \ $(LIBSMPP34_CFLAGS) \ @@ -123,5 +124,7 @@ $(LIBOSMOCORE_CFLAGS) \ $(LIBOSMOGSM_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOSCCP_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(NULL) -- To view, visit https://gerrit.osmocom.org/5138 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I67b5d797a80b55e01dcdbb8c782748b049cf9199 Gerrit-PatchSet: 1 Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Owner: Alexander Huemer
