From 28695292b76726f31416e710f7d698b65e2ba875 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 16 May 2016 11:50:33 -0500 Subject: [PATCH] link w/ --no-undefined --- ...tc-audio-processing-0.2-no_undefined.patch | 41 +++++++++++++++++++ webrtc-audio-processing.spec | 17 +++++++- 2 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 webrtc-audio-processing-0.2-no_undefined.patch diff --git a/webrtc-audio-processing-0.2-no_undefined.patch b/webrtc-audio-processing-0.2-no_undefined.patch new file mode 100644 index 0000000..e294340 --- /dev/null +++ b/webrtc-audio-processing-0.2-no_undefined.patch @@ -0,0 +1,41 @@ +diff -up webrtc-audio-processing-0.2/configure.ac.no_undefined webrtc-audio-processing-0.2/configure.ac +--- webrtc-audio-processing-0.2/configure.ac.no_undefined 2016-05-16 11:35:36.770987385 -0500 ++++ webrtc-audio-processing-0.2/configure.ac 2016-05-16 11:37:51.686505286 -0500 +@@ -42,7 +42,7 @@ AS_CASE(["${host}"], + [*-*linux*], + [ + OS_CFLAGS="-DWEBRTC_LINUX" +- PLATFORM_CFLAGS="-DWEBRTC_POSIX" ++ PLATFORM_CFLAGS="-DWEBRTC_POSIX -pthread" + ], + [*-*darwin*], + [ +diff -up webrtc-audio-processing-0.2/webrtc/modules/audio_processing/Makefile.am.no_undefined webrtc-audio-processing-0.2/webrtc/modules/audio_processing/Makefile.am +--- webrtc-audio-processing-0.2/webrtc/modules/audio_processing/Makefile.am.no_undefined 2015-11-19 06:41:44.000000000 -0600 ++++ webrtc-audio-processing-0.2/webrtc/modules/audio_processing/Makefile.am 2016-05-16 11:35:36.772987393 -0500 +@@ -166,8 +166,8 @@ libwebrtc_audio_processing_la_LIBADD = $ + $(top_builddir)/webrtc/base/libbase.la \ + $(top_builddir)/webrtc/system_wrappers/libsystem_wrappers.la \ + $(top_builddir)/webrtc/common_audio/libcommon_audio.la \ +- $(top_builddir)/webrtc/modules/audio_coding/libaudio_coding.la +-libwebrtc_audio_processing_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBWEBRTC_AUDIO_PROCESSING_VERSION_INFO) ++ $(top_builddir)/webrtc/modules/audio_coding/libaudio_coding.la -lpthread ++libwebrtc_audio_processing_la_LDFLAGS = $(AM_LDFLAGS) -Wl,--no-undefined -version-info $(LIBWEBRTC_AUDIO_PROCESSING_VERSION_INFO) + + # FIXME: The MIPS optimisations need to be hooked up once we have the + # autotools conditionals in place +diff -up webrtc-audio-processing-0.2/webrtc/modules/audio_processing/Makefile.in.no_undefined webrtc-audio-processing-0.2/webrtc/modules/audio_processing/Makefile.in +--- webrtc-audio-processing-0.2/webrtc/modules/audio_processing/Makefile.in.no_undefined 2015-11-19 06:41:56.000000000 -0600 ++++ webrtc-audio-processing-0.2/webrtc/modules/audio_processing/Makefile.in 2016-05-16 11:35:44.151015614 -0500 +@@ -580,9 +580,9 @@ libwebrtc_audio_processing_la_LIBADD = $ + $(top_builddir)/webrtc/base/libbase.la \ + $(top_builddir)/webrtc/system_wrappers/libsystem_wrappers.la \ + $(top_builddir)/webrtc/common_audio/libcommon_audio.la \ +- $(top_builddir)/webrtc/modules/audio_coding/libaudio_coding.la ++ $(top_builddir)/webrtc/modules/audio_coding/libaudio_coding.la -lpthread + +-libwebrtc_audio_processing_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBWEBRTC_AUDIO_PROCESSING_VERSION_INFO) ++libwebrtc_audio_processing_la_LDFLAGS = $(AM_LDFLAGS) -Wl,--no-undefined -version-info $(LIBWEBRTC_AUDIO_PROCESSING_VERSION_INFO) + + # FIXME: The MIPS optimisations need to be hooked up once we have the + # autotools conditionals in place diff --git a/webrtc-audio-processing.spec b/webrtc-audio-processing.spec index fc2da1c..cb3c187 100644 --- a/webrtc-audio-processing.spec +++ b/webrtc-audio-processing.spec @@ -5,7 +5,7 @@ Name: webrtc-audio-processing Version: 0.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for echo cancellation License: BSD @@ -15,7 +15,11 @@ Patch0: webrtc-fix-typedefs-on-other-arches.patch # can't use sse2 on %%ix86 in fedora Patch1: webrtc-audio-processing-0.2-no_sse2_x86.patch # match for patch1 when autoreconf'ing (unused, so far) -Patch2: webrtc-audio-processing-0.2-no_sse2_x86-ac.patch +Patch10: webrtc-audio-processing-0.2-no_sse2_x86-ac.patch + +Patch2: webrtc-audio-processing-0.2-no_undefined.patch + +BuildRequires: automake libtool %description %{name} is a library derived from Google WebRTC project that @@ -34,6 +38,12 @@ files for developing applications that use %{name}. %setup -q %patch0 -p1 -b .typedef %patch1 -p1 -b .no_sse2_x86 +%patch10 -p1 -b .no_sse2_x86_ac +%patch2 -p1 -b .no_undefined + +# for patch10/patch2 +autoreconf -fi + %build %configure \ @@ -64,6 +74,9 @@ rm -fv %{buildroot}%{_libdir}/lib*.la %changelog +* Mon May 16 2016 Rex Dieter - 0.2-2 +- link w/ --no-undefined + * Thu May 12 2016 Rex Dieter - 0.2-1 - webrtc-audio-processing-0.2 (#1335536) - %%files: track ABI/API closer