summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Kretov <firegurafiku@gmail.com>2017-10-30 17:42:07 +0300
committerJames Le Cuirot <chewi@gentoo.org>2017-10-31 22:07:42 +0000
commitdbdf2d20b6dcdb2bc11d1737bb170ac8674659c2 (patch)
treed270c30c860cd7e8efefc85806b772141b28b35a /media-libs
parentsys-apps/smartmontools: Update live ebuild (diff)
downloadgentoo-dbdf2d20b6dcdb2bc11d1737bb170ac8674659c2.tar.gz
gentoo-dbdf2d20b6dcdb2bc11d1737bb170ac8674659c2.tar.bz2
gentoo-dbdf2d20b6dcdb2bc11d1737bb170ac8674659c2.zip
media-libs/ftgl: skip unit tests (bug #619390)
The build issue seem to be related to C++11 support in CppUnit and can be worked around with one of the following approaches: - compiling with CXXFLAGS+='-std=c++11', - disabling unit tests completely. In order not to introduce formal CppUnit dependency into the ebuild, the latter approach is chosen. Closes: https://github.com/gentoo/gentoo/pull/6087
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch12
1 files changed, 11 insertions, 1 deletions
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
index 43571d5a07db..945c8742c644 100644
--- a/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch
+++ b/media-libs/ftgl/files/ftgl-2.1.3_rc5-gentoo.patch
@@ -1,6 +1,16 @@
--- configure.ac.old 2008-11-21 14:41:15.000000000 +0100
+++ configure.ac 2008-11-21 14:44:19.000000000 +0100
-@@ -64,19 +64,11 @@
+@@ -50,8 +50,7 @@
+ FTGL_CHECK_GLUT
+ FTGL_CHECK_FONT
+
+-PKG_CHECK_MODULES(CPPUNIT, cppunit, [CPPUNIT="yes"], [CPPUNIT="no"])
+-AC_MSG_RESULT($CPPUNIT)
++CPPUNIT="no"
+ AM_CONDITIONAL(HAVE_CPPUNIT, test "x$CPPUNIT" != "xno")
+
+ dnl search the include directory (required for non-srcdir builds).
+@@ -64,19 +63,11 @@
CFLAGS="${CFLAGS} -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs"
# Build HTML documentatin?