| 1 |
commit: 7bdad57c38b8d002a1adc5d3d73cbd4ea6c6ccea |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Sep 23 05:39:42 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 17 16:59:20 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bdad57c |
| 7 |
|
| 8 |
media-libs/audiofile: Fix dependence on bundled gtest |
| 9 |
|
| 10 |
Removes the last vestiges of autotools' dependence on the bundled gtest |
| 11 |
and fixes the build to correct testing without USE="static-libs". |
| 12 |
|
| 13 |
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com> |
| 14 |
Closes: https://bugs.gentoo.org/511882 |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/9953 |
| 16 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 17 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 18 |
|
| 19 |
.../files/audiofile-0.3.6-system-gtest.patch | 35 ++++++++++++++++++++++ |
| 20 |
1 file changed, 35 insertions(+) |
| 21 |
|
| 22 |
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 |
| 23 |
index 31e77e11271..f2421bdfcac 100644 |
| 24 |
--- a/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch |
| 25 |
+++ b/media-libs/audiofile/files/audiofile-0.3.6-system-gtest.patch |
| 26 |
@@ -1,3 +1,38 @@ |
| 27 |
+--- audiofile-0.3.6/configure.ac |
| 28 |
++++ audiofile-0.3.6/configure.ac |
| 29 |
+@@ -160,7 +160,6 @@ |
| 30 |
+ audiofile-uninstalled.pc |
| 31 |
+ sfcommands/Makefile |
| 32 |
+ test/Makefile |
| 33 |
+- gtest/Makefile |
| 34 |
+ examples/Makefile |
| 35 |
+ libaudiofile/Makefile |
| 36 |
+ libaudiofile/alac/Makefile |
| 37 |
+--- audiofile-0.3.6/libaudiofile/Makefile.am |
| 38 |
++++ audiofile-0.3.6/libaudiofile/Makefile.am |
| 39 |
+@@ -108,10 +108,9 @@ |
| 40 |
+ TESTS_ENVIRONMENT = $(top_builddir)/libtool --mode=execute $(VALGRIND) $(VALGRIND_FLAGS) |
| 41 |
+ endif |
| 42 |
+ |
| 43 |
+-LIBGTEST = ../gtest/libgtest.la |
| 44 |
+ |
| 45 |
+-UnitTests_SOURCES = modules/UT_RebufferModule.cpp |
| 46 |
+-UnitTests_LDADD = libaudiofile.la $(LIBGTEST) |
| 47 |
++UnitTests_SOURCES = modules/UT_RebufferModule.cpp $(libaudiofile_la_SOURCES) |
| 48 |
++UnitTests_LDADD = $(libaudiofile_la_LIBADD) -lgtest |
| 49 |
+ UnitTests_CPPFLAGS = -I$(top_srcdir) |
| 50 |
+ UnitTests_CXXFLAGS = -fno-rtti -fno-exceptions -DGTEST_HAS_RTTI=0 -DGTEST_HAS_EXCEPTIONS=0 |
| 51 |
+ UnitTests_LDFLAGS = -static |
| 52 |
+--- audiofile-0.3.6/Makefile.am |
| 53 |
++++ audiofile-0.3.6/Makefile.am |
| 54 |
+@@ -1,6 +1,6 @@ |
| 55 |
+ ## Process this file with automake to produce Makefile.in |
| 56 |
+ |
| 57 |
+-SUBDIRS = gtest libaudiofile sfcommands test examples docs |
| 58 |
++SUBDIRS = libaudiofile sfcommands test examples docs |
| 59 |
+ |
| 60 |
+ EXTRA_DIST = \ |
| 61 |
+ ACKNOWLEDGEMENTS \ |
| 62 |
--- audiofile-0.3.6/test/Makefile.am |
| 63 |
+++ audiofile-0.3.6/test/Makefile.am |
| 64 |
@@ -59,79 +59,77 @@ |
Archives