diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-20 10:25:01 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-09-20 10:26:24 +0300 |
| commit | 90fc5593a44f41489719bc882db21813416f80da (patch) | |
| tree | 5de908bfe732514c13612bd5c16060c9ef441498 /liborcus | |
| parent | 7e871bbaf7b208dd884528259211385b8074da39 (diff) | |
Revert "Pass also gb_CXXFLAGS to the liborcus configury"
Causes way too much problems with the tinderboxes, thanks to -Werror
getting passed to the liborcus configury, and liborcus apparently is
quite -Werror-unclean.
Thus also revert the initial fixes for those WaEs. (Many more would be
needed, it seems. I rather leave it to Kohei to make upstream liborcus
warning-free.
This reverts commit 083fa89dd8f894f9cd0ef217a900fab777db9f2a.
This reverts commit 7e871bbaf7b208dd884528259211385b8074da39.
This reverts commit 21b5706f83edecad8cd3d0ab3ce5110b82e75a46.
This reverts commit bed5557e8bdfe5c698a45a4cc82619a7c22de001.
Diffstat (limited to 'liborcus')
| -rw-r--r-- | liborcus/ExternalProject_liborcus.mk | 2 | ||||
| -rw-r--r-- | liborcus/UnpackedTarball_orcus.mk | 2 | ||||
| -rw-r--r-- | liborcus/liborcus_0.1.0-warnings.patch | 45 |
3 files changed, 2 insertions, 47 deletions
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk index 9691c6037a07..f67b48c64063 100644 --- a/liborcus/ExternalProject_liborcus.mk +++ b/liborcus/ExternalProject_liborcus.mk @@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : --without-libzip \ --disable-debug \ --disable-spreadsheet-model \ - CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(OUTDIR)/inc/external) $(gb_CXXFLAGS)" \ + $(if $(filter NO,$(SYSTEM_BOOST)),CXXFLAGS=-I$(OUTDIR)/inc/external) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(GNUMAKE) \ && touch $@ diff --git a/liborcus/UnpackedTarball_orcus.mk b/liborcus/UnpackedTarball_orcus.mk index f6a054b942ca..030eebdea1ec 100644 --- a/liborcus/UnpackedTarball_orcus.mk +++ b/liborcus/UnpackedTarball_orcus.mk @@ -14,7 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,orcus,$(ORCUS_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,orcus,0)) orcus_patches := -# -Werror=unused-variable -Werror=unused-private-field -Werror=shadow +# -Werror,-Wunused-variable -Werror,-Wunused-private-field orcus_patches += liborcus_0.1.0-warnings.patch # make config.sub recognize arm-linux-androideabi orcus_patches += liborcus_0.1.0-configure.patch diff --git a/liborcus/liborcus_0.1.0-warnings.patch b/liborcus/liborcus_0.1.0-warnings.patch index 9ba566c5c278..8ce6533c0908 100644 --- a/liborcus/liborcus_0.1.0-warnings.patch +++ b/liborcus/liborcus_0.1.0-warnings.patch @@ -60,48 +60,3 @@ } else { ---- include/orcus/pstring.hpp -+++ include/orcus/pstring.hpp -@@ -82,8 +82,8 @@ - }; - - pstring() : m_pos(NULL), m_size(0) {} -- pstring(const char* pos) : m_pos(pos) { m_size = ::std::strlen(pos); } -- pstring(const char* pos, size_t size) : m_pos(pos), m_size(size) {} -+ pstring(const char* pos_) : m_pos(pos_) { m_size = ::std::strlen(pos_); } -+ pstring(const char* pos_, size_t size_) : m_pos(pos_), m_size(size_) {} - - ::std::string str() const { return ::std::string(m_pos, m_size); } - -@@ -110,11 +110,11 @@ - - bool operator< (const pstring& r) const; - -- bool operator== (const char* str) const; -+ bool operator== (const char* str_) const; - -- bool operator!= (const char* str) const -+ bool operator!= (const char* str_) const - { -- return !operator==(str); -+ return !operator==(str_); - } - - pstring trim() const; - - ---- include/orcus/sax_parser.hpp -+++ include/orcus/sax_parser.hpp -@@ -159,9 +159,9 @@ - - template<typename _Handler> - sax_parser<_Handler>::sax_parser( -- const char* content, const size_t size, handler_type& handler) : -- m_content(content), -- m_char(content), -+ const char* content_, const size_t size, handler_type& handler) : -+ m_content(content_), -+ m_char(content_), - m_size(size), - m_pos(0), - m_nest_level(0), |