summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Levine <plevine457@gmail.com>2018-09-23 01:39:42 -0400
committerLars Wendler <polynomial-c@gentoo.org>2019-02-17 17:59:20 +0100
commit7bdad57c38b8d002a1adc5d3d73cbd4ea6c6ccea (patch)
treeab66ebf68e93e478fd8c8874bd7ae58bae44d21e /media-libs
parentmedia-libs/audiofile: Fix audiofile-0.3.6-CVE-2015-7747.patch (diff)
downloadgentoo-7bdad57c38b8d002a1adc5d3d73cbd4ea6c6ccea.tar.gz
gentoo-7bdad57c38b8d002a1adc5d3d73cbd4ea6c6ccea.tar.bz2
gentoo-7bdad57c38b8d002a1adc5d3d73cbd4ea6c6ccea.zip
media-libs/audiofile: Fix dependence on bundled gtest
Removes the last vestiges of autotools' dependence on the bundled gtest and fixes the build to correct testing without USE="static-libs". Signed-off-by: Peter Levine <plevine457@gmail.com> Closes: https://bugs.gentoo.org/511882 Closes: https://github.com/gentoo/gentoo/pull/9953 Package-Manager: Portage-2.3.49, Repoman-2.3.10 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch b/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch
index 31e77e11271d..f2421bdfcac3 100644
--- a/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch
+++ b/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch
@@ -1,3 +1,38 @@
+--- audiofile-0.3.6/configure.ac
++++ audiofile-0.3.6/configure.ac
+@@ -160,7 +160,6 @@
+ audiofile-uninstalled.pc
+ sfcommands/Makefile
+ test/Makefile
+- gtest/Makefile
+ examples/Makefile
+ libaudiofile/Makefile
+ libaudiofile/alac/Makefile
+--- audiofile-0.3.6/libaudiofile/Makefile.am
++++ audiofile-0.3.6/libaudiofile/Makefile.am
+@@ -108,10 +108,9 @@
+ TESTS_ENVIRONMENT = $(top_builddir)/libtool --mode=execute $(VALGRIND) $(VALGRIND_FLAGS)
+ endif
+
+-LIBGTEST = ../gtest/libgtest.la
+
+-UnitTests_SOURCES = modules/UT_RebufferModule.cpp
+-UnitTests_LDADD = libaudiofile.la $(LIBGTEST)
++UnitTests_SOURCES = modules/UT_RebufferModule.cpp $(libaudiofile_la_SOURCES)
++UnitTests_LDADD = $(libaudiofile_la_LIBADD) -lgtest
+ UnitTests_CPPFLAGS = -I$(top_srcdir)
+ UnitTests_CXXFLAGS = -fno-rtti -fno-exceptions -DGTEST_HAS_RTTI=0 -DGTEST_HAS_EXCEPTIONS=0
+ UnitTests_LDFLAGS = -static
+--- audiofile-0.3.6/Makefile.am
++++ audiofile-0.3.6/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+-SUBDIRS = gtest libaudiofile sfcommands test examples docs
++SUBDIRS = libaudiofile sfcommands test examples docs
+
+ EXTRA_DIST = \
+ ACKNOWLEDGEMENTS \
--- audiofile-0.3.6/test/Makefile.am
+++ audiofile-0.3.6/test/Makefile.am
@@ -59,79 +59,77 @@