ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Revert "Pass also gb_CXXFLAGS to the liborcus configury"

Browse Source 
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 083fa89dd8.
This reverts commit 7e871bbaf7.
This reverts commit 21b5706f83.
This reverts commit bed5557e8b.
This commit is contained in:
Tor Lillqvist
2012-09-20 10:26:24 +03:00
parent 7e871bbaf7
commit 90fc5593a4
3 changed files with 2 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
liborcus/ExternalProject_liborcus.mk
+1 -1
View File
@@ -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 $@
liborcus/UnpackedTarball_orcus.mk
+1 -1
View File
@@ -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
liborcus/liborcus_0.1.0-warnings.patch
-45
View File
@@ -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),