<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-netif/+/22848">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Don't depend on libosmo-abis (by default)<br><br>The only reason we have a libosmo-netif -> libosmo-abis<br>dependency is the lapd examples whihc are built but not even installed.<br><br>Let's build those only if --enable-lapd-examples is specified at the<br>command line, and remove the dependency to libosmo-abis in all other<br>cases.<br><br>Change-Id: Ida8157cd9111b196e4bf08782c45d0e3d393f1c9<br>Closes: OS#4726<br>---<br>M configure.ac<br>M contrib/jenkins.sh<br>M contrib/libosmo-netif.spec.in<br>M debian/control<br>M examples/Makefile.am<br>5 files changed, 17 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/48/22848/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 36c2f49..1b2a459 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -91,8 +91,19 @@</span><br><span> </span><br><span> PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.3.0)</span><br><span> PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 1.3.0)</span><br><span style="color: hsl(0, 100%, 40%);">-dnl FIXME: We depend on libosmoabis by now until we can move LAPD code here</span><br><span style="color: hsl(0, 100%, 40%);">-PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+AC_ARG_ENABLE([lapd_examples],</span><br><span style="color: hsl(120, 100%, 40%);">+ [AS_HELP_STRING(</span><br><span style="color: hsl(120, 100%, 40%);">+ [--enable-lapd-examples],</span><br><span style="color: hsl(120, 100%, 40%);">+ [Build some lapd examples]</span><br><span style="color: hsl(120, 100%, 40%);">+ )],</span><br><span style="color: hsl(120, 100%, 40%);">+ [lapd_examples=$enableval], [lapd_examples="no"])</span><br><span style="color: hsl(120, 100%, 40%);">+AS_IF([test "x$lapd_examples" = "xyes"], [</span><br><span style="color: hsl(120, 100%, 40%);">+ PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.6.0)</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([ENABLE_LAPD], [1], [Enable LAPD examples])</span><br><span style="color: hsl(120, 100%, 40%);">+])</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CONDITIONAL(ENABLE_LAPD, test "x$lapd_examples" = "xyes")</span><br><span style="color: hsl(120, 100%, 40%);">+AC_SUBST(ENABLE_LAPD)</span><br><span> </span><br><span> AC_ARG_ENABLE([libsctp], [AS_HELP_STRING([--disable-libsctp], [Do not enable socket multiaddr APIs requiring libsctp])],</span><br><span> [ENABLE_LIBSCTP=$enableval], [ENABLE_LIBSCTP="yes"])</span><br><span>diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh</span><br><span>index bf04643..543671c 100755</span><br><span>--- a/contrib/jenkins.sh</span><br><span>+++ b/contrib/jenkins.sh</span><br><span>@@ -35,7 +35,7 @@</span><br><span> set -x</span><br><span> </span><br><span> autoreconf --install --force</span><br><span style="color: hsl(0, 100%, 40%);">-./configure --enable-sanitize --enable-werror</span><br><span style="color: hsl(120, 100%, 40%);">+./configure --enable-sanitize --enable-werror --enable-lapd-examples</span><br><span> $MAKE $PARALLEL_MAKE</span><br><span> $MAKE $PARALLEL_MAKE distcheck \</span><br><span> || cat-testlogs.sh</span><br><span>diff --git a/contrib/libosmo-netif.spec.in b/contrib/libosmo-netif.spec.in</span><br><span>index 98d021b..95690a7 100644</span><br><span>--- a/contrib/libosmo-netif.spec.in</span><br><span>+++ b/contrib/libosmo-netif.spec.in</span><br><span>@@ -24,7 +24,6 @@</span><br><span> BuildRequires: libtool >= 2</span><br><span> BuildRequires: lksctp-tools-devel</span><br><span> BuildRequires: pkgconfig >= 0.20</span><br><span style="color: hsl(0, 100%, 40%);">-BuildRequires: pkgconfig(libosmoabis) >= 0.6.0</span><br><span> BuildRequires: pkgconfig(libosmocore) >= 1.0.0</span><br><span> BuildRequires: pkgconfig(libosmogsm) >= 1.0.0</span><br><span> </span><br><span>diff --git a/debian/control b/debian/control</span><br><span>index d242b48..8b76089 100644</span><br><span>--- a/debian/control</span><br><span>+++ b/debian/control</span><br><span>@@ -12,7 +12,6 @@</span><br><span> git,</span><br><span> doxygen,</span><br><span> libosmocore-dev (>= 1.3.0),</span><br><span style="color: hsl(0, 100%, 40%);">- libosmo-abis-dev (>= 0.6.0),</span><br><span> pkg-config,</span><br><span> libpcap0.8-dev,</span><br><span> libsctp-dev</span><br><span>diff --git a/examples/Makefile.am b/examples/Makefile.am</span><br><span>index 4125243..6d74238 100644</span><br><span>--- a/examples/Makefile.am</span><br><span>+++ b/examples/Makefile.am</span><br><span>@@ -4,8 +4,6 @@</span><br><span> </span><br><span> noinst_PROGRAMS = ipa-stream-client \</span><br><span> ipa-stream-server \</span><br><span style="color: hsl(0, 100%, 40%);">- lapd-over-datagram-user \</span><br><span style="color: hsl(0, 100%, 40%);">- lapd-over-datagram-network \</span><br><span> stream-client \</span><br><span> stream-server \</span><br><span> rs232-read \</span><br><span>@@ -27,6 +25,8 @@</span><br><span> ipa_stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \</span><br><span> $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+if ENABLE_LAPD</span><br><span style="color: hsl(120, 100%, 40%);">+noinst_PROGRAMS += lapd-over-datagram-user lapd-over-datagram-network</span><br><span> lapd_over_datagram_user_SOURCES = lapd-over-datagram-user.c</span><br><span> lapd_over_datagram_user_LDADD = $(top_builddir)/src/libosmonetif.la \</span><br><span> $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \</span><br><span>@@ -36,6 +36,7 @@</span><br><span> lapd_over_datagram_network_LDADD = $(top_builddir)/src/libosmonetif.la \</span><br><span> $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \</span><br><span> $(LIBOSMOABIS_LIBS)</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span> </span><br><span> stream_client_SOURCES = stream-client.c</span><br><span> stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-netif/+/22848">change 22848</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmo-netif/+/22848"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-netif </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ida8157cd9111b196e4bf08782c45d0e3d393f1c9 </div>
<div style="display:none"> Gerrit-Change-Number: 22848 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>