diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-27 22:06:10 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-27 22:06:10 +0100 |
| commit | e7682068a184d5233229533585f9bd06298c7731 (patch) | |
| tree | 80e468327d6b231d413d89097d8c97593f7a2145 /external | |
| parent | 077ad1a5ab6848255e0350df368c4f45ae73da9c (diff) | |
Pass ENABLE_DEBUG into external/libetonyek
(and consequently fix the argument type of one assert invocation)
Change-Id: I8bf5f024cc104a3885f7b9bf6ed63b9f6259d47b
Diffstat (limited to 'external')
| -rw-r--r-- | external/libetonyek/ExternalProject_libetonyek.mk | 2 | ||||
| -rw-r--r-- | external/libetonyek/UnpackedTarball_libetonyek.mk | 6 | ||||
| -rw-r--r-- | external/libetonyek/assert.patch | 20 |
3 files changed, 26 insertions, 2 deletions
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk index 84d6e7fc1a95..0d281b52108b 100644 --- a/external/libetonyek/ExternalProject_libetonyek.mk +++ b/external/libetonyek/ExternalProject_libetonyek.mk @@ -30,7 +30,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) : --enable-static \ --disable-shared \ --without-docs \ - --disable-debug \ + $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ --disable-werror \ --disable-weffc \ --without-tools \ diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk index 7a8746c7a22e..448e41e379e5 100644 --- a/external/libetonyek/UnpackedTarball_libetonyek.mk +++ b/external/libetonyek/UnpackedTarball_libetonyek.mk @@ -11,6 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,libetonyek)) $(eval $(call gb_UnpackedTarball_set_tarball,libetonyek,$(ETONYEK_TARBALL))) -$(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,1)) +$(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,libetonyek, \ + external/libetonyek/assert.patch \ +)) # vim: set noet sw=4 ts=4: diff --git a/external/libetonyek/assert.patch b/external/libetonyek/assert.patch new file mode 100644 index 000000000000..39d68db27a29 --- /dev/null +++ b/external/libetonyek/assert.patch @@ -0,0 +1,20 @@ +--- src/lib/EtonyekDocument.cpp ++++ src/lib/EtonyekDocument.cpp +@@ -7,6 +7,8 @@ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + ++#include <cassert> ++ + #include <boost/scoped_ptr.hpp> + #include <boost/shared_ptr.hpp> + #include <boost/logic/tribool.hpp> +@@ -179,7 +181,7 @@ + info.input->seek(0, RVNG_SEEK_SET); + } + +- assert(!isGzipped); ++ assert(bool(!isGzipped)); + + return probeXMLImpl(info.input, probe, type, info); + } |