<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/17483">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;">libosmosim: Build irrespective of PC/SC support<br><br>libosmosim contains a variety of definitions and utility fuinctions<br>useful when working with SIM card [protocol]. They can not only<br>be used with PC/SC readers but also in other contexts.<br><br>Change-Id: I741940d3dc2a5653c760e9d1597d7f08afb3b631<br>---<br>M configure.ac<br>M src/sim/Makefile.am<br>M src/sim/reader.c<br>3 files changed, 14 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 1056a0a..3b4ad40 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -142,6 +142,7 @@</span><br><span> ])</span><br><span> AS_IF([test "x$ENABLE_PCSC" = "xyes"], [</span><br><span> PKG_CHECK_MODULES(PCSC, libpcsclite)</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_PCSC],[1],[Build with PC/SC support])</span><br><span> ])</span><br><span> AM_CONDITIONAL(ENABLE_PCSC, test "x$ENABLE_PCSC" = "xyes")</span><br><span> AC_SUBST(ENABLE_PCSC)</span><br><span>diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am</span><br><span>index c608757..14bbbd8 100644</span><br><span>--- a/src/sim/Makefile.am</span><br><span>+++ b/src/sim/Makefile.am</span><br><span>@@ -4,24 +4,26 @@</span><br><span> LIBVERSION=1:2:1</span><br><span> </span><br><span> AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)/include</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CFLAGS = -fPIC -Wall $(PCSC_CFLAGS) $(TALLOC_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CFLAGS = -fPIC -Wall $(TALLOC_CFLAGS)</span><br><span> AM_LDFLAGS = $(COVERAGE_LDFLAGS)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-if ENABLE_PCSC</span><br><span style="color: hsl(0, 100%, 40%);">-# FIXME: only build the PC/SC dependent part conditional, but always build other parts</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> noinst_HEADERS = sim_int.h gsm_int.h</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+if !EMBEDDED</span><br><span> lib_LTLIBRARIES = libosmosim.la</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-libosmosim_la_SOURCES = core.c reader.c reader_pcsc.c class_tables.c \</span><br><span style="color: hsl(120, 100%, 40%);">+libosmosim_la_SOURCES = core.c reader.c class_tables.c \</span><br><span> card_fs_sim.c card_fs_usim.c card_fs_uicc.c \</span><br><span> card_fs_isim.c card_fs_tetra.c</span><br><span> libosmosim_la_LDFLAGS = -version-info $(LIBVERSION)</span><br><span> libosmosim_la_LIBADD = \</span><br><span> $(top_builddir)/src/libosmocore.la \</span><br><span> $(top_builddir)/src/gsm/libosmogsm.la \</span><br><span style="color: hsl(0, 100%, 40%);">- $(TALLOC_LIBS) \</span><br><span style="color: hsl(0, 100%, 40%);">- $(PCSC_LIBS)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ $(TALLOC_LIBS)</span><br><span style="color: hsl(120, 100%, 40%);">+if ENABLE_PCSC</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CFLAGS += $(PCSC_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+libosmosim_la_SOURCES += reader_pcsc.c</span><br><span style="color: hsl(120, 100%, 40%);">+libosmosim_la_LIBADD += $(PCSC_LIBS)</span><br><span> endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+endif # !EMBEDDED</span><br><span>diff --git a/src/sim/reader.c b/src/sim/reader.c</span><br><span>index d1a9ae6..d5292ba 100644</span><br><span>--- a/src/sim/reader.c</span><br><span>+++ b/src/sim/reader.c</span><br><span>@@ -35,6 +35,7 @@</span><br><span> #include <osmocom/core/msgb.h></span><br><span> #include <osmocom/sim/sim.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include "config.h"</span><br><span> </span><br><span> #include "sim_int.h"</span><br><span> </span><br><span>@@ -242,9 +243,11 @@</span><br><span> struct osim_reader_hdl *rh;</span><br><span> </span><br><span> switch (driver) {</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef HAVE_PCSC</span><br><span> case OSIM_READER_DRV_PCSC:</span><br><span> ops = &pcsc_reader_ops;</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> default:</span><br><span> return NULL;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/17483">change 17483</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/libosmocore/+/17483"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I741940d3dc2a5653c760e9d1597d7f08afb3b631 </div>
<div style="display:none"> Gerrit-Change-Number: 17483 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>