From 5d6ccd68d8ba400d90d5a1a86b9bc30bcb2f1dd1b1589f1431fe79d290c28447 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 2 Oct 2014 21:36:14 +0000 Subject: [PATCH] libosmo-netif-0.0.4 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-netif?expand=0&rev=1 --- .gitattributes | 23 ++++++ .gitignore | 1 + libosmo-netif-0.0.4.tar.xz | 3 + libosmo-netif.changes | 5 ++ libosmo-netif.spec | 98 +++++++++++++++++++++++ osmo-allincludes.diff | 83 +++++++++++++++++++ osmo-cppflags.diff | 73 +++++++++++++++++ osmo-ldadd.diff | 63 +++++++++++++++ osmo-talloc.diff | 159 +++++++++++++++++++++++++++++++++++++ osmo-version.diff | 20 +++++ 10 files changed, 528 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 libosmo-netif-0.0.4.tar.xz create mode 100644 libosmo-netif.changes create mode 100644 libosmo-netif.spec create mode 100644 osmo-allincludes.diff create mode 100644 osmo-cppflags.diff create mode 100644 osmo-ldadd.diff create mode 100644 osmo-talloc.diff create mode 100644 osmo-version.diff diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/libosmo-netif-0.0.4.tar.xz b/libosmo-netif-0.0.4.tar.xz new file mode 100644 index 0000000..3c5d4ff --- /dev/null +++ b/libosmo-netif-0.0.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd83be65e20d9afb3cb3f1ed01a5a62406358e51e331c946d84c7decd5207028 +size 105900 diff --git a/libosmo-netif.changes b/libosmo-netif.changes new file mode 100644 index 0000000..c29dfb6 --- /dev/null +++ b/libosmo-netif.changes @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Thu Oct 2 20:58:44 UTC 2014 - jengelh@inai.de + +- Initial package (version 0.0.4) for build.opensuse.org + diff --git a/libosmo-netif.spec b/libosmo-netif.spec new file mode 100644 index 0000000..151a817 --- /dev/null +++ b/libosmo-netif.spec @@ -0,0 +1,98 @@ +# +# spec file for package libosmo-netif +# +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: libosmo-netif +Summary: Osmocom library for muxed audio +Version: 0.0.4 +Release: 0 +License: AGPL-3.0+ and GPL-2.0+ +Group: Development/Libraries/C and C++ +Url: http://openbsc.osmocom.org/trac/ + +#Git-Clone: git://git.osmocom.org/libosmo-netif +#Git-Web: http://git.osmocom.org/libosmo-netif/ +#Snapshot: 0.0.4 +#Update osmo-version.diff too! +Source: %name-%version.tar.xz +Patch1: osmo-version.diff +Patch2: osmo-cppflags.diff +Patch3: osmo-ldadd.diff +Patch4: osmo-allincludes.diff +Patch5: osmo-talloc.diff +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: autoconf +BuildRequires: automake +#BuildRequires: dahdi-linux-devel +BuildRequires: libtool >= 2 +BuildRequires: pkg-config +BuildRequires: xz +BuildRequires: pkgconfig(libosmoabis) >= 0.0.7 +BuildRequires: pkgconfig(libosmocore) >= 0.3.0 +BuildRequires: pkgconfig(libosmogsm) >= 0.3.0 +BuildRequires: pkgconfig(libosmovty) >= 0.3.0 +BuildRequires: pkgconfig(ortp) >= 0.15.0 + +%description + +%package -n libosmonetif2 +Summary: Osmocom library for muxed audio +License: AGPL-3.0+ +Group: System/Libraries + +%description -n libosmonetif2 + +%package -n libosmonetif-devel +Summary: Development files for the Osmocom muxed audio library +License: AGPL-3.0+ +Group: Development/Libraries/C and C++ +Requires: libosmonetif2 = %version + +%description -n libosmonetif-devel + +%prep +%setup -qn %name +%patch -P 1 -P 2 -P 3 -P 4 -P 5 -p1 + +%build +autoreconf -fiv +%configure --enable-shared --disable-static +make %{?_smp_mflags} + +%install +b="%buildroot" +make %{?_smp_mflags} install DESTDIR="$b" +find "$b/%_libdir" -type f -name "*.la" -delete + +%check +make %{?_smp_mflags} check + +%post -n libosmonetif2 -p /sbin/ldconfig +%postun -n libosmonetif2 -p /sbin/ldconfig + +%files -n libosmonetif2 +%defattr(-,root,root) +%_libdir/libosmonetif.so.2* + +%files -n libosmonetif-devel +%defattr(-,root,root) +%dir %_includedir/osmocom +%_includedir/osmocom/netif/ +%_libdir/libosmonetif.so +%_libdir/pkgconfig/libosmo-netif.pc + +%changelog diff --git a/osmo-allincludes.diff b/osmo-allincludes.diff new file mode 100644 index 0000000..87a3acf --- /dev/null +++ b/osmo-allincludes.diff @@ -0,0 +1,83 @@ +From 226e99483234c100e5a18ea12838d98a3b091de6 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Thu, 2 Oct 2014 23:22:18 +0200 +Subject: [PATCH] build: remove all_includes + +This variable is never set and could therefore be removed. +--- + Makefile.am | 1 - + examples/Makefile.am | 2 +- + examples/channel/Makefile.am | 2 +- + src/Makefile.am | 2 +- + src/channel/abis/Makefile.am | 2 +- + tests/Makefile.am | 2 +- + 6 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index c8a05a3..519d1ae 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,6 @@ + AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 + ACLOCAL_AMFLAGS = -I m4 + +-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include + SUBDIRS = include src examples tests + + pkgconfigdir = $(libdir)/pkgconfig +diff --git a/examples/Makefile.am b/examples/Makefile.am +index f8cfc8f..ddfaa48 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ++AM_CPPFLAGS = -I$(top_srcdir)/include + AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) + AM_LDFLAGS = $(COVERAGE_LDFLAGS) + +diff --git a/examples/channel/Makefile.am b/examples/channel/Makefile.am +index 4191c94..c417909 100644 +--- a/examples/channel/Makefile.am ++++ b/examples/channel/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ++AM_CPPFLAGS = -I$(top_srcdir)/include + AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) + AM_LDFLAGS = $(COVERAGE_LDFLAGS) + +diff --git a/src/Makefile.am b/src/Makefile.am +index ca40152..7fbdaf2 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2,7 +2,7 @@ + # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification + LIBVERSION=2:0:0 + +-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) ++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) + AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) + AM_LDFLAGS = $(COVERAGE_LDFLAGS) + +diff --git a/src/channel/abis/Makefile.am b/src/channel/abis/Makefile.am +index 7b744f2..9ccce1d 100644 +--- a/src/channel/abis/Makefile.am ++++ b/src/channel/abis/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) ++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) + AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) + AM_LDFLAGS = $(COVERAGE_LDFLAGS) + +diff --git a/tests/Makefile.am b/tests/Makefile.am +index 0c1fed3..a986940 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -1,4 +1,4 @@ +-AM_CFLAGS = -Wall $(all_includes) -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) ++AM_CFLAGS = -Wall -I$(top_srcdir)/include $(LIBOSMOCORE_CFLAGS) + AM_LDFLAGS = $(LIBOSMOCORE_LDFLAGS) + + check_PROGRAMS = osmux/osmux_test +-- +2.0.0 + diff --git a/osmo-cppflags.diff b/osmo-cppflags.diff new file mode 100644 index 0000000..921d1aa --- /dev/null +++ b/osmo-cppflags.diff @@ -0,0 +1,73 @@ +From 603f6c40d55b87f81fbd8ff1ad7b9568f3b962ff Mon Sep 17 00:00:00 2001 +From: Martin Hauke +Date: Thu, 11 Sep 2014 17:11:38 +0200 +Subject: [PATCH] build: rename INCLUDES to AM_CPPFLAGS in Makefile.am to avoid + warnings + +--- + Makefile.am | 2 +- + examples/Makefile.am | 2 +- + examples/channel/Makefile.am | 2 +- + src/Makefile.am | 2 +- + src/channel/abis/Makefile.am | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 91abed1..c8a05a3 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,7 +1,7 @@ + AUTOMAKE_OPTIONS = foreign dist-bzip2 1.6 + ACLOCAL_AMFLAGS = -I m4 + +-INCLUDES = $(all_includes) -I$(top_srcdir)/include ++AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include + SUBDIRS = include src examples tests + + pkgconfigdir = $(libdir)/pkgconfig +diff --git a/examples/Makefile.am b/examples/Makefile.am +index e7742cd..f8cfc8f 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,4 +1,4 @@ +-INCLUDES = $(all_includes) -I$(top_srcdir)/include ++AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include + AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) + AM_LDFLAGS = $(COVERAGE_LDFLAGS) + +diff --git a/examples/channel/Makefile.am b/examples/channel/Makefile.am +index 6ab34b6..4191c94 100644 +--- a/examples/channel/Makefile.am ++++ b/examples/channel/Makefile.am +@@ -1,4 +1,4 @@ +-INCLUDES = $(all_includes) -I$(top_srcdir)/include ++AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include + AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) + AM_LDFLAGS = $(COVERAGE_LDFLAGS) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 4fd93d7..8b4b58e 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2,7 +2,7 @@ + # Please read Chapter 6 "Library interface versions" of the libtool documentation before making any modification + LIBVERSION=2:0:0 + +-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) ++AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) + AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) + AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) + +diff --git a/src/channel/abis/Makefile.am b/src/channel/abis/Makefile.am +index 3c6fef6..e4d93a3 100644 +--- a/src/channel/abis/Makefile.am ++++ b/src/channel/abis/Makefile.am +@@ -1,4 +1,4 @@ +-INCLUDES = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) ++AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) + AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) + AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) + +-- +2.0.0 + diff --git a/osmo-ldadd.diff b/osmo-ldadd.diff new file mode 100644 index 0000000..76c612e --- /dev/null +++ b/osmo-ldadd.diff @@ -0,0 +1,63 @@ +From de816861cb000453991c52896315ae5a65a0fdf7 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Thu, 2 Oct 2014 23:18:06 +0200 +Subject: [PATCH] build: put dependency libraries in the right place in + Makefiles + +Libs must be in _LDADD/_LIBADD and not in _LDFLAGS. +--- + src/Makefile.am | 4 ++-- + src/channel/abis/Makefile.am | 3 ++- + tests/osmo-pcap-test/Makefile.am | 2 +- + 3 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 8b4b58e..ca40152 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -4,13 +4,13 @@ LIBVERSION=2:0:0 + + AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) + AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) +-AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) ++AM_LDFLAGS = $(COVERAGE_LDFLAGS) + + SUBDIRS = channel + + lib_LTLIBRARIES = libosmonetif.la + +-libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la ++libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) + libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined + + libosmonetif_la_SOURCES = amr.c \ +diff --git a/src/channel/abis/Makefile.am b/src/channel/abis/Makefile.am +index e4d93a3..7b744f2 100644 +--- a/src/channel/abis/Makefile.am ++++ b/src/channel/abis/Makefile.am +@@ -1,8 +1,9 @@ + AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir) + AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) +-AM_LDFLAGS = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(COVERAGE_LDFLAGS) ++AM_LDFLAGS = $(COVERAGE_LDFLAGS) + + noinst_LTLIBRARIES = libosmonetif-abis.la + + libosmonetif_abis_la_SOURCES = ipa_stream_server.c \ + ipa_stream_client.c ++libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) +diff --git a/tests/osmo-pcap-test/Makefile.am b/tests/osmo-pcap-test/Makefile.am +index 0be6fc4..a256005 100644 +--- a/tests/osmo-pcap-test/Makefile.am ++++ b/tests/osmo-pcap-test/Makefile.am +@@ -9,6 +9,6 @@ osmo_pcap_test_SOURCES = proto.c \ + osmux_test.c \ + pcap.c + +-osmo_pcap_test_LDFLAGS = -lpcap \ ++osmo_pcap_test_LDADD = -lpcap \ + -losmocore \ + -losmonetif +-- +2.0.0 + diff --git a/osmo-talloc.diff b/osmo-talloc.diff new file mode 100644 index 0000000..e9b0b56 --- /dev/null +++ b/osmo-talloc.diff @@ -0,0 +1,159 @@ +From 1c54312597f7a4c5eae2c495ef321f424913dcb9 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Thu, 2 Oct 2014 23:26:16 +0200 +Subject: [PATCH] build: support external libtalloc + +--- + configure.ac | 1 + + examples/Makefile.am | 26 +++++++++++++------------- + examples/channel/Makefile.am | 6 +++--- + src/Makefile.am | 4 ++-- + src/channel/abis/Makefile.am | 4 ++-- + 5 files changed, 21 insertions(+), 20 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 28dde0c..cef782e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -43,6 +43,7 @@ PKG_CHECK_MODULES(LIBOSMOGSM, libosmogsm >= 0.3.0) + dnl FIXME: We depend on libosmoabis by now until we can move LAPD code here + PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 0.0.7) + PKG_CHECK_MODULES(ORTP, ortp >= 0.15.0) ++PKG_CHECK_MODULES([TALLOC], [talloc]) + + AC_CHECK_HEADERS(dahdi/user.h,,AC_MSG_WARN(DAHDI input driver will not be built)) + +diff --git a/examples/Makefile.am b/examples/Makefile.am +index ddfaa48..a5f4d1f 100644 +--- a/examples/Makefile.am ++++ b/examples/Makefile.am +@@ -1,5 +1,5 @@ + AM_CPPFLAGS = -I$(top_srcdir)/include +-AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) ++AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS) + AM_LDFLAGS = $(COVERAGE_LDFLAGS) + + SUBDIRS = channel +@@ -19,48 +19,48 @@ noinst_PROGRAMS = ipa-stream-client \ + + ipa_stream_client_SOURCES = ipa-stream-client.c + ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + ipa_stream_server_SOURCES = ipa-stream-server.c + ipa_stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + lapd_over_datagram_user_SOURCES = lapd-over-datagram-user.c + lapd_over_datagram_user_LDADD = $(top_builddir)/src/libosmonetif.la \ + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ +- $(LIBOSMOABIS_LIBS) ++ $(LIBOSMOABIS_LIBS) $(TALLOC_LIBS) + + lapd_over_datagram_network_SOURCES = lapd-over-datagram-network.c + lapd_over_datagram_network_LDADD = $(top_builddir)/src/libosmonetif.la \ + $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) \ +- $(LIBOSMOABIS_LIBS) ++ $(LIBOSMOABIS_LIBS) $(TALLOC_LIBS) + + stream_client_SOURCES = stream-client.c + stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + stream_server_SOURCES = stream-server.c + stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + rs232_read_SOURCES = rs232-read.c +-rs232_read_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) ++rs232_read_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(TALLOC_LIBS) + + rs232_write_SOURCES = rs232-write.c +-rs232_write_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) ++rs232_write_LDADD = $(top_builddir)/src/libosmonetif.la $(LIBOSMOCORE_LIBS) $(TALLOC_LIBS) + + rtp_udp_test_client_SOURCES = rtp-udp-test-client.c + rtp_udp_test_client_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + rtp_udp_test_server_SOURCES = rtp-udp-test-server.c + rtp_udp_test_server_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + osmux_test_input_SOURCES = osmux-test-input.c + osmux_test_input_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + osmux_test_output_SOURCES = osmux-test-output.c + osmux_test_output_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) +diff --git a/examples/channel/Makefile.am b/examples/channel/Makefile.am +index c417909..2f003ce 100644 +--- a/examples/channel/Makefile.am ++++ b/examples/channel/Makefile.am +@@ -1,5 +1,5 @@ + AM_CPPFLAGS = -I$(top_srcdir)/include +-AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) ++AM_CFLAGS=-Wall -g $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS) + AM_LDFLAGS = $(COVERAGE_LDFLAGS) + + noinst_PROGRAMS = abis_ipa_stream_server \ +@@ -7,8 +7,8 @@ noinst_PROGRAMS = abis_ipa_stream_server \ + + abis_ipa_stream_server_SOURCES = abis_ipa_stream_server.c + abis_ipa_stream_server_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) + + abis_ipa_stream_client_SOURCES = abis_ipa_stream_client.c + abis_ipa_stream_client_LDADD = $(top_builddir)/src/libosmonetif.la \ +- $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) ++ $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(TALLOC_LIBS) +diff --git a/src/Makefile.am b/src/Makefile.am +index 7fbdaf2..e0f3754 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -3,14 +3,14 @@ + LIBVERSION=2:0:0 + + AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) +-AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) ++AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS) + AM_LDFLAGS = $(COVERAGE_LDFLAGS) + + SUBDIRS = channel + + lib_LTLIBRARIES = libosmonetif.la + +-libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) ++libosmonetif_la_LIBADD = channel/abis/libosmonetif-abis.la $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(TALLOC_LIBS) + libosmonetif_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined + + libosmonetif_la_SOURCES = amr.c \ +diff --git a/src/channel/abis/Makefile.am b/src/channel/abis/Makefile.am +index 9ccce1d..bc066cb 100644 +--- a/src/channel/abis/Makefile.am ++++ b/src/channel/abis/Makefile.am +@@ -1,9 +1,9 @@ + AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir) +-AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) ++AM_CFLAGS= -fPIC -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(COVERAGE_CFLAGS) $(TALLOC_CFLAGS) + AM_LDFLAGS = $(COVERAGE_LDFLAGS) + + noinst_LTLIBRARIES = libosmonetif-abis.la + + libosmonetif_abis_la_SOURCES = ipa_stream_server.c \ + ipa_stream_client.c +-libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) ++libosmonetif_abis_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(TALLOC_LIBS) +-- +2.0.0 + diff --git a/osmo-version.diff b/osmo-version.diff new file mode 100644 index 0000000..8b6c2b5 --- /dev/null +++ b/osmo-version.diff @@ -0,0 +1,20 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Sun, 17 Feb 2013 21:53:34 +0100 +Subject: [PATCH] build: set version + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 28dde0c..93bc119 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ + AC_INIT([libosmo-netif], +- m4_esyscmd([./git-version-gen .tarball-version]), ++ [0.0.4], + [openbsc-devel@lists.openbsc.org]) + + AM_INIT_AUTOMAKE([dist-bzip2])