<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/487530990445b6da4305cc49a50f35738db8dc84">https://github.com/macports/macports-ports/commit/487530990445b6da4305cc49a50f35738db8dc84</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4875309 osmocore: update release to 1.3.0 and devel to 20200118-e51cbe4c
</span>4875309 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 487530990445b6da4305cc49a50f35738db8dc84
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Jan 21 11:30:40 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> osmocore: update release to 1.3.0 and devel to 20200118-e51cbe4c
</span>---
science/osmocore/Portfile | 41 ++++++++------
science/osmocore/files/patch-configure.ac.diff | 4 +-
science/osmocore/files/patch-fix-python.devel.diff | 4 +-
.../osmocore/files/patch-fix-python.release.diff | 64 ++++++++++++++++++----
.../files/patch-fix_clock_gettime.release.diff | 12 ++--
.../osmocore/files/patch-src_usb_Makefile.am.diff | 15 +++++
6 files changed, 100 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/Portfile b/science/osmocore/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index db4e02f..fab9364 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,15 +16,17 @@ platforms darwin macosx
</span> # bump the epoch to switch the main port from a "devel" type to a release
epoch 1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.c_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> subport osmocore-devel {}
if {${subport} eq ${name}} {
# release
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup osmocom libosmocore 1.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 96ec886e0f351471cdf7bb655c194567b78e8a63 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d6388773076631248824d6d6071d8954394658da9fb7583c310423ee094da066 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1234997
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup osmocom libosmocore 1.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 b225cad23edc006bf26c7d1680aba034dad1cf6a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 cc36bfff7ca362b72dc2977e89493cd63597e70e8f999adeaa4de8203d41a9fb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1287754
</span> revision 0
# fix 'timer_clockgettime.c' to work with OSs that don't provide
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,11 +41,11 @@ if {${subport} eq ${name}} {
</span> } else {
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup osmocom libosmocore a47d37c94684ba688a6eec06d0346ee13b03aad4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20191211-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 b254f99796f9f0e5ea641ce2100dbb18311a91df \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4a09de363e1e684da77d03992357f7ee9f61f6eea4e90e8097b95880213e3a02 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1277471
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup osmocom libosmocore e51cbe4cc7db6daf388a5dfb2c889b4070a57b6a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20200118-[string range ${github.version} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 8ec3d3629ebdb5d3420e0caa33feb09f21aead62 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b98059bc81a3dc1b877759fc0244727c1f131c9ecc20f54a7803b29915f49ca2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1288451
</span> revision 0
# fix 'timer_clockgettime.c' to work with OSs that don't provide
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,15 +57,6 @@ if {${subport} eq ${name}} {
</span>
patchfiles-append patch-fix-python.devel.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fix use of Python2, part 2, for devel only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@PYTHON_EXECUTABLE@|${frameworks_dir}/Python.framework/Versions/2.7/bin/python2.7|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- utils/gsmtap.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- utils/gsmtap_logread.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- contrib/struct_endianess.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- contrib/fsm-to-dot.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,6 +82,10 @@ patchfiles-append patch-configure.ac.diff
</span>
patchfiles-append patch-include_osmocom_coding_gsm0503_parity.h.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# temporary patch to fix library target name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-src_usb_Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # fix use of Python2, part 2, for both release and devel
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,6 +95,10 @@ post-patch {
</span> ${worksrcpath}/tests/Makefile.am \
${worksrcpath}/utils/conv_codes_gsm.py \
${worksrcpath}/utils/conv_gen.py \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/utils/gsmtap.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/utils/gsmtap_logread.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/contrib/struct_endianess.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/contrib/fsm-to-dot.py
</span> }
# use autotools to get ready to configure
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,6 +113,10 @@ pre-configure {
</span> configure.ldflags-delete -L${prefix}/lib
configure.cppflags-delete -I${prefix}/include
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# set c11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -std=gnu11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.ldflags-append -std=gnu11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
--disable-pcsc \
--disable-pseudotalloc \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-configure.ac.diff b/science/osmocore/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 00f8441..8c21782 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ index 7f2aabd..8cfe69f 100644
</span>
dnl *This* is the root dir, even if an install-sh exists in ../ or ../../
AC_CONFIG_AUX_DIR([.])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -395,8 +393,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -408,8 +406,7 @@
</span> AC_MSG_RESULT([CFLAGS="$CFLAGS"])
AC_MSG_RESULT([CPPFLAGS="$CPPFLAGS"])
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ index 7f2aabd..8cfe69f 100644
</span> libosmocodec.pc
libosmocoding.pc
libosmovty.pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -424,4 +401,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -439,4 +416,5 @@
</span> Doxyfile.coding
Doxyfile.gb
Doxyfile.ctrl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-fix-python.devel.diff b/science/osmocore/files/patch-fix-python.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 296b41d..4c52a90 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-fix-python.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-fix-python.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ diff --git a/include/Makefile.am b/include/Makefile.am
</span> index d76addd..dbe789b 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -180,7 +180,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,7 +186,7 @@
</span> $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@
osmocom/gsm/gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@ diff --git a/tests/Makefile.am b/tests/Makefile.am
</span> index 3a3ea37..161d06f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -362,7 +362,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -368,7 +368,7 @@
</span> mv $@.tmp $@
conv/gsm0503_test_vectors.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-fix-python.release.diff b/science/osmocore/files/patch-fix-python.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b72819c..4c52a90 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-fix-python.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-fix-python.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,58 +1,98 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/contrib/fsm-to-dot.py b/contrib/fsm-to-dot.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 85e2806..4e92dcd 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/contrib/fsm-to-dot.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/contrib/fsm-to-dot.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!@PYTHON_EXECUTABLE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ __doc__ = '''
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fsm-to-dot: convert FSM definitons to graph images
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/contrib/struct_endianess.py b/contrib/struct_endianess.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index be73fbe..67f67cd 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/contrib/struct_endianess.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/contrib/struct_endianess.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!@PYTHON_EXECUTABLE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '''Using mad regexes, automatically make sure that all structs with sub-byte
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ integers have matching big-endian definitions. The idea is to save a lot of
</span> diff --git a/include/Makefile.am b/include/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 19695d1..6a746b1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d76addd..dbe789b 100644
</span> --- a/include/Makefile.am
+++ b/include/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -180,7 +180,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -186,7 +186,7 @@
</span> $(AM_V_GEN)sed -e's/XX/$*/g' $< > $@
osmocom/gsm/gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_header gsm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_header gsm \
</span> + $(AM_V_GEN)@PYTHON_EXECUTABLE@ $(top_srcdir)/utils/conv_gen.py gen_header gsm \
--target-path $(builddir)/osmocom/gsm
CLEANFILES = osmocom/gsm/gsm0503.h
diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 29299a6..fe519ae 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4a1faca..7a7bfb9 100644
</span> --- a/src/gsm/Makefile.am
+++ b/src/gsm/Makefile.am
@@ -49,6 +49,6 @@
# Convolutional codes generation
gsm0503_conv.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_codes gsm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_codes gsm
</span> + $(AM_V_GEN)@PYTHON_EXECUTABLE@ $(top_srcdir)/utils/conv_gen.py gen_codes gsm
CLEANFILES = gsm0503_conv.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 18d4bb4..6191867 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3a3ea37..161d06f 100644
</span> --- a/tests/Makefile.am
+++ b/tests/Makefile.am
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -350,7 +350,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -368,7 +368,7 @@
</span> mv $@.tmp $@
conv/gsm0503_test_vectors.c: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(AM_V_GEN)python $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \
</span> + $(AM_V_GEN)@PYTHON_EXECUTABLE@ $(top_srcdir)/utils/conv_gen.py gen_vectors gsm \
--target-path $(builddir)/conv
if ENABLE_EXT_TESTS
diff --git a/utils/conv_codes_gsm.py b/utils/conv_codes_gsm.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index ec77660..48b161a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e189985..48b161a 100644
</span> --- a/utils/conv_codes_gsm.py
+++ b/utils/conv_codes_gsm.py
@@ -1,4 +1,4 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python3
</span> +#!@PYTHON_EXECUTABLE@
# -*- coding: utf-8 -*-
from conv_gen import ConvolutionalCode
diff --git a/utils/conv_gen.py b/utils/conv_gen.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 06283d8..88968d3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d2eda15..88968d3 100644
</span> --- a/utils/conv_gen.py
+++ b/utils/conv_gen.py
@@ -1,4 +1,4 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python3
</span> +#!@PYTHON_EXECUTABLE@
mod_license = """
/*
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/utils/gsmtap.py b/utils/gsmtap.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b7211ad..b1a9365 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/utils/gsmtap.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/utils/gsmtap.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!@PYTHON_EXECUTABLE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # License: MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright 2019 by Sysmocom s.f.m.c. GmbH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Author: Alexander Couzens <lynxis@fe80.eu>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/utils/gsmtap_logread.py b/utils/gsmtap_logread.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a29f149..629c394 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/utils/gsmtap_logread.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/utils/gsmtap_logread.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!@PYTHON_EXECUTABLE@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # License: MIT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Copyright 2019 by Sysmocom s.f.m.c. GmbH
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-fix_clock_gettime.release.diff b/science/osmocore/files/patch-fix_clock_gettime.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 7cdf037..d04047e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/osmocore/files/patch-fix_clock_gettime.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-fix_clock_gettime.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ index 7ad5908..4237714 100644
</span> # for src/conv.c
AC_FUNC_ALLOCA
AC_SEARCH_LIBS([dlopen], [dl dld], [LIBRARY_DLOPEN="$LIBS";LIBS=""])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,7 +132,7 @@ dnl Check if We need to apply workaround for TLS bug on ARM platform for GCC < 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -129,7 +135,7 @@
</span> ARG_ENABLE_DETECT_TLS_GCC_ARM_BUG
dnl Generate the output
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -317,13 +317,13 @@ diff --git a/src/select.c b/src/select.c
</span> index 7ce135f..3f368f1 100644
--- a/src/select.c
+++ b/src/select.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <osmocom/core/timer.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <osmocom/core/logging.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,7 +39,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <osmocom/core/talloc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <osmocom/core/utils.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> -#include "../config.h"
+#include <osmocom/config.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
diff --git a/src/sercomm.c b/src/sercomm.c
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/osmocore/files/patch-src_usb_Makefile.am.diff b/science/osmocore/files/patch-src_usb_Makefile.am.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2db3c0a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/osmocore/files/patch-src_usb_Makefile.am.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/usb/Makefile.am b/src/usb/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bca39bf..03cd482 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/usb/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/usb/Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,8 +12,8 @@ if ENABLE_LIBUSB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib_LTLIBRARIES = libosmousb.la
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libosmousb_la_SOURCES = osmo_libusb.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libosmosim_la_LDFLAGS = -version-info $(LIBVERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-libosmosim_la_LIBADD = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++libosmousb_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++libosmousb_la_LIBADD = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(top_builddir)/src/libosmocore.la \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(TALLOC_LIBS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(LIBUSB_LIBS)
</span></pre><pre style='margin:0'>
</pre>