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 <[email protected]> Closes: https://bugs.gentoo.org/511882 Closes: gentoo#9953 Package-Manager: Portage-2.3.49, Repoman-2.3.10 Signed-off-by: Lars Wendler <[email protected]>
hanetzer · Feb 17, 2019 · 7bdad57 · 7bdad57
1 parent 9e3ac4d
commit 7bdad57
Showing 1 changed file with 35 additions and 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
@@ -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 @@