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/.
daniel gerrit-no-reply at lists.osmocom.orgdaniel has submitted this change and it was merged. Change subject: Make pcap dependency optional ...................................................................... Make pcap dependency optional Previously we required pcap.h unconditionally which causes embedded build failure because it's not included in current version of out poky toolchain. We can add it to toolchain but it's only necessary for utils/osmo-meas-pcap2db which is not built for sysmobts anyway so it's easier to just make this dependency optional and build osmo-meas-pcap2db only if it's available - similar to the way we build osmo-meas-udp2db. Related: SYS#3610 Change-Id: I77a5f7eafe0282abedacffad6a9bcb0a8f2b5caa --- M openbsc/configure.ac M openbsc/src/utils/Makefile.am 2 files changed, 9 insertions(+), 2 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/openbsc/configure.ac b/openbsc/configure.ac index 7e244bc..c6ae159 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -120,7 +120,10 @@ dnl checks for header files AC_HEADER_STDC AC_CHECK_HEADERS(dbi/dbd.h,,AC_MSG_ERROR(DBI library is not installed)) -AC_CHECK_HEADERS(pcap/pcap.h,,AC_MSG_ERROR(PCAP library is not installed)) + +found_pcap=yes +AC_CHECK_HEADERS(pcap/pcap.h,,found_pcap=no) +AM_CONDITIONAL(HAVE_PCAP, test "$found_pcap" = yes) found_cdk=yes AC_CHECK_HEADERS(cdk/cdk.h,,found_cdk=no) diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am index ab4f3ce..9c3837a 100644 --- a/openbsc/src/utils/Makefile.am +++ b/openbsc/src/utils/Makefile.am @@ -29,9 +29,13 @@ $(NULL) if HAVE_SQLITE3 bin_PROGRAMS += \ - osmo-meas-pcap2db \ osmo-meas-udp2db \ $(NULL) +if HAVE_PCAP +bin_PROGRAMS += \ + osmo-meas-pcap2db \ + $(NULL) +endif endif if HAVE_LIBCDK bin_PROGRAMS += \ -- To view, visit https://gerrit.osmocom.org/2458 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I77a5f7eafe0282abedacffad6a9bcb0a8f2b5caa Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Max <msuraev at sysmocom.de> Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann at sysmocom.de>