diff --git a/0001-build-fixes.patch b/0001-build-fixes.patch index 29e6ab1..eb80149 100644 --- a/0001-build-fixes.patch +++ b/0001-build-fixes.patch @@ -4,6 +4,9 @@ Date: Mon, 21 Jul 2014 10:13:00 +0200 Subject: [PATCH] build: fixes 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 Multimedia Transfer Protocol library. --- @@ -12,10 +15,10 @@ Multimedia Transfer Protocol library. libosmo-sccp.pc.in | 2 +- src/Makefile.am | 20 +++++++++++++++----- tests/m2ua/Makefile.am | 2 +- - tests/sccp/Makefile.am | 3 ++- + tests/sccp/Makefile.am | 6 +++--- tests/ss7/Makefile.am | 2 -- 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 =================================================================== @@ -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/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 ${TALLOC_CFLAGS} AM_CFLAGS=-Wall -ggdb3 $(LIBOSMOCORE_CFLAGS) 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 = \ $(LIBOSMOCORE_LIBS) \ - $(top_builddir)/src/sccp.o \ -+ ${TALLOC_LIBS} \ +- $(top_builddir)/src/sccp.o \ ++ ${TALLOC_LIBS} \ $(NULL) Index: libosmo-sccp-1.2.0/tests/ss7/Makefile.am diff --git a/libosmo-sccp.changes b/libosmo-sccp.changes index c64e295..89026fb 100644 --- a/libosmo-sccp.changes +++ b/libosmo-sccp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 7 11:42:32 UTC 2020 - Jan Engelhardt + +- Update 0001-build-fixes.patch to build sccp_test with SOURCES, + not LDADD. + ------------------------------------------------------------------- Sun Jan 5 10:19:06 UTC 2020 - Martin Hauke diff --git a/libosmo-sccp.spec b/libosmo-sccp.spec index bd0be42..51295ee 100644 --- a/libosmo-sccp.spec +++ b/libosmo-sccp.spec @@ -28,7 +28,6 @@ URL: https://projects.osmocom.org/projects/libosmo-sccp #Git-Clone: git://git.osmocom.org/libosmo-sccp Source: %name-%version.tar.xz Patch1: 0001-build-fixes.patch -Patch2: 0002-build-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake >= 1.6 BuildRequires: libtool >= 2