<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15722">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">contrib/jenkins.sh: Also build host/gadget code<br><br>Change-Id: Ided54d69a776ce2b86f4117a27fc7ad3b7a1a1d2<br>---<br>M ccid_host/Makefile<br>M contrib/jenkins.sh<br>2 files changed, 19 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ccid_host/Makefile b/ccid_host/Makefile</span><br><span>index 53ee932..c8862a2 100644</span><br><span>--- a/ccid_host/Makefile</span><br><span>+++ b/ccid_host/Makefile</span><br><span>@@ -1,13 +1,14 @@</span><br><span style="color: hsl(0, 100%, 40%);">-CFLAGS=-Wall -g -I../ccid_common -I.</span><br><span style="color: hsl(120, 100%, 40%);">+CFLAGS=-Wall -g $(shell pkg-config --cflags libosmocore) -I../ccid_common -I.</span><br><span style="color: hsl(120, 100%, 40%);">+LIBS?=-lasan $(shell pkg-config --libs libosmocore)</span><br><span> </span><br><span> ccid_functionfs: ccid_main_functionfs.o \</span><br><span>                ccid_slot_sim.o \</span><br><span>            ../ccid_common/ccid_proto.o \</span><br><span>                ../ccid_common/ccid_device.o</span><br><span style="color: hsl(0, 100%, 40%);">-   $(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc -laio</span><br><span style="color: hsl(120, 100%, 40%);">+     $(CC) $(CFLAGS) -o $@ $^ $(LIBS) -laio</span><br><span> </span><br><span> hub_functionfs: hub_main_functionfs.o</span><br><span style="color: hsl(0, 100%, 40%);">-     $(CC) $(CFLAGS) -o $@ $^ -lasan -losmocore -ltalloc -laio</span><br><span style="color: hsl(120, 100%, 40%);">+     $(CC) $(CFLAGS) -o $@ $^ $(LIBS) -laio</span><br><span> </span><br><span> %.o: %.c</span><br><span>       $(CC) $(CFLAGS) -o $@ -c $^</span><br><span>diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh</span><br><span>index 19bc222..fb324cc 100755</span><br><span>--- a/contrib/jenkins.sh</span><br><span>+++ b/contrib/jenkins.sh</span><br><span>@@ -13,6 +13,21 @@</span><br><span> inst="$TOPDIR/install"</span><br><span> export deps inst</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+echo</span><br><span style="color: hsl(120, 100%, 40%);">+echo "=============== libosmocore hostt build ==========="</span><br><span style="color: hsl(120, 100%, 40%);">+osmo-build-dep.sh libosmocore "" --disable-doxygen</span><br><span style="color: hsl(120, 100%, 40%);">+export PKG_CONFIG_PATH="$inst/lib/pkgconfig:$PKG_CONFIG_PATH"</span><br><span style="color: hsl(120, 100%, 40%);">+export LD_LIBRARY_PATH="$inst/lib"</span><br><span style="color: hsl(120, 100%, 40%);">+export PATH="$inst/bin:$PATH"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+echo</span><br><span style="color: hsl(120, 100%, 40%);">+echo "=============== CCID usb_gadget build ==========="</span><br><span style="color: hsl(120, 100%, 40%);">+cd $TOPDIR/ccid_host</span><br><span style="color: hsl(120, 100%, 40%);">+make clean</span><br><span style="color: hsl(120, 100%, 40%);">+make $PARALLEL_MAKE</span><br><span style="color: hsl(120, 100%, 40%);">+make clean</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> # adapted from</span><br><span> echo</span><br><span> echo "=============== libosmocore cross-build ==========="</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/15722">change 15722</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/osmo-ccid-firmware/+/15722"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ided54d69a776ce2b86f4117a27fc7ad3b7a1a1d2 </div>
<div style="display:none"> Gerrit-Change-Number: 15722 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>