pool/libosmo-sccp
SHA256
3
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update 0001-build-fixes.patch to build sccp_test with SOURCES,

Browse Source 
not LDADD.

OBS-URL: https://build.opensuse.org/package/show/network:telephony/libosmo-sccp?expand=0&rev=37
This commit is contained in:
Jan Engelhardt 2020-01-07 11:42:59 +00:00 committed by Git OBS Bridge
parent 5ef7300407
commit 32cae2f874
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
0001-build-fixes.patch
View File

@ -4,6 +4,9 @@ Date: Mon, 21 Jul 2014 10:13:00 +0200
Subject: [PATCH] build: fixes Subject: [PATCH] build: fixes
Find and use system talloc, do not rely on OSMO's bundled copy. Find and use system talloc, do not rely on OSMO's bundled copy.
Avoid adding .o files into _LDADD, this is nonportable.
Rename libmtp to libosmo-mtp, as libmtp is already used by the Rename libmtp to libosmo-mtp, as libmtp is already used by the
Multimedia Transfer Protocol library. Multimedia Transfer Protocol library.
--- ---
@ -12,10 +15,10 @@ Multimedia Transfer Protocol library.
libosmo-sccp.pc.in | 2 +- libosmo-sccp.pc.in | 2 +-
src/Makefile.am | 20 +++++++++++++++----- src/Makefile.am | 20 +++++++++++++++-----
tests/m2ua/Makefile.am | 2 +- tests/m2ua/Makefile.am | 2 +-
tests/sccp/Makefile.am | 3 ++- tests/sccp/Makefile.am | 6 +++---
tests/ss7/Makefile.am | 2 -- tests/ss7/Makefile.am | 2 --
tests/xua/Makefile.am | 6 ++---- tests/xua/Makefile.am | 6 ++----
8 files changed, 23 insertions(+), 15 deletions(-) 8 files changed, 24 insertions(+), 17 deletions(-)
Index: libosmo-sccp-1.2.0/configure.ac Index: libosmo-sccp-1.2.0/configure.ac
=================================================================== ===================================================================
@ -104,17 +107,21 @@ Index: libosmo-sccp-1.2.0/tests/sccp/Makefile.am
=================================================================== ===================================================================
--- libosmo-sccp-1.2.0.orig/tests/sccp/Makefile.am --- libosmo-sccp-1.2.0.orig/tests/sccp/Makefile.am
+++ libosmo-sccp-1.2.0/tests/sccp/Makefile.am +++ libosmo-sccp-1.2.0/tests/sccp/Makefile.am
@@ -1,4 +1,4 @@ @@ -1,13 +1,13 @@
-AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include
+AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ${TALLOC_CFLAGS} +AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include ${TALLOC_CFLAGS}
AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS)
EXTRA_DIST = sccp_test.ok EXTRA_DIST = sccp_test.ok
@@ -9,5 +9,6 @@ sccp_test_SOURCES = sccp_test.c
noinst_PROGRAMS = sccp_test
-sccp_test_SOURCES = sccp_test.c
+sccp_test_SOURCES = sccp_test.c ${top_srcdir}/src/sccp.c
sccp_test_LDADD = \ sccp_test_LDADD = \
$(LIBOSMOCORE_LIBS) \ $(LIBOSMOCORE_LIBS) \
$(top_builddir)/src/sccp.o \ - $(top_builddir)/src/sccp.o \
+ ${TALLOC_LIBS} \ + ${TALLOC_LIBS} \
$(NULL) $(NULL)
Index: libosmo-sccp-1.2.0/tests/ss7/Makefile.am Index: libosmo-sccp-1.2.0/tests/ss7/Makefile.am

6
libosmo-sccp.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jan 7 11:42:32 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
- Update 0001-build-fixes.patch to build sccp_test with SOURCES,
not LDADD.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 5 10:19:06 UTC 2020 - Martin Hauke <mardnh@gmx.de> Sun Jan 5 10:19:06 UTC 2020 - Martin Hauke <mardnh@gmx.de>

1
libosmo-sccp.spec
View File

@ -28,7 +28,6 @@ URL: https://projects.osmocom.org/projects/libosmo-sccp
#Git-Clone: git://git.osmocom.org/libosmo-sccp #Git-Clone: git://git.osmocom.org/libosmo-sccp
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
Patch1: 0001-build-fixes.patch Patch1: 0001-build-fixes.patch
Patch2: 0002-build-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: automake >= 1.6 BuildRequires: automake >= 1.6
BuildRequires: libtool >= 2 BuildRequires: libtool >= 2