From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/audiofile/files/
Date: Sun, 17 Feb 2019 16:59:30 +0000 (UTC) [thread overview]
Message-ID: <1550422760.7bdad57c38b8d002a1adc5d3d73cbd4ea6c6ccea.polynomial-c@gentoo> (raw)
commit: 7bdad57c38b8d002a1adc5d3d73cbd4ea6c6ccea
Author: Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun Sep 23 05:39:42 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 16:59:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bdad57c
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 <AT> 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 <AT> gentoo.org>
.../files/audiofile-0.3.6-system-gtest.patch | 35 ++++++++++++++++++++++
1 file changed, 35 insertions(+)
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 31e77e11271..f2421bdfcac 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 @@
next reply other threads:[~2019-02-17 16:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-17 16:59 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-02-17 16:59 [gentoo-commits] repo/gentoo:master commit in: media-libs/audiofile/files/ Lars Wendler
2020-08-10 23:14 Aaron Bauman
2024-05-09 0:52 Sam James
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1550422760.7bdad57c38b8d002a1adc5d3d73cbd4ea6c6ccea.polynomial-c@gentoo \
--to=polynomial-c@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox