| 1 |
commit: dbdf2d20b6dcdb2bc11d1737bb170ac8674659c2 |
| 2 |
Author: Pavel Kretov <firegurafiku <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Mon Oct 30 14:42:07 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 31 22:07:42 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbdf2d20 |
| 7 |
|
| 8 |
media-libs/ftgl: skip unit tests (bug #619390) |
| 9 |
|
| 10 |
The build issue seem to be related to C++11 support in CppUnit and can be |
| 11 |
worked around with one of the following approaches: |
| 12 |
|
| 13 |
- compiling with CXXFLAGS+='-std=c++11', |
| 14 |
- disabling unit tests completely. |
| 15 |
|
| 16 |
In order not to introduce formal CppUnit dependency into the ebuild, |
| 17 |
the latter approach is chosen. |
| 18 |
Closes: https://github.com/gentoo/gentoo/pull/6087 |
| 19 |
|
| 20 |
media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch | 12 +++++++++++- |
| 21 |
1 file changed, 11 insertions(+), 1 deletion(-) |
| 22 |
|
| 23 |
diff --git a/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch b/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch |
| 24 |
index 43571d5a07d..945c8742c64 100644 |
| 25 |
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch |
| 26 |
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch |
| 27 |
@@ -1,6 +1,16 @@ |
| 28 |
--- configure.ac.old 2008-11-21 14:41:15.000000000 +0100 |
| 29 |
+++ configure.ac 2008-11-21 14:44:19.000000000 +0100 |
| 30 |
-@@ -64,19 +64,11 @@ |
| 31 |
+@@ -50,8 +50,7 @@ |
| 32 |
+ FTGL_CHECK_GLUT |
| 33 |
+ FTGL_CHECK_FONT |
| 34 |
+ |
| 35 |
+-PKG_CHECK_MODULES(CPPUNIT, cppunit, [CPPUNIT="yes"], [CPPUNIT="no"]) |
| 36 |
+-AC_MSG_RESULT($CPPUNIT) |
| 37 |
++CPPUNIT="no" |
| 38 |
+ AM_CONDITIONAL(HAVE_CPPUNIT, test "x$CPPUNIT" != "xno") |
| 39 |
+ |
| 40 |
+ dnl search the include directory (required for non-srcdir builds). |
| 41 |
+@@ -64,19 +63,11 @@ |
| 42 |
CFLAGS="${CFLAGS} -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs" |
| 43 |
|
| 44 |
# Build HTML documentatin? |
Archives