diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2016-12-28 10:45:36 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2016-12-28 10:47:02 +0000 |
| commit | a121971a2a828064776d338ed771bdfc5b852052 (patch) | |
| tree | c0148f70f9a4cceeeef74e25b75dcbdb922d9a0e /sys-block/thin-provisioning-tools/files | |
| parent | net-libs/nghttp2: Removed old. (diff) | |
| download | gentoo-a121971a2a828064776d338ed771bdfc5b852052.tar.gz gentoo-a121971a2a828064776d338ed771bdfc5b852052.tar.bz2 gentoo-a121971a2a828064776d338ed771bdfc5b852052.zip | |
sys-block/thin-provisioning-tools: Version Bump and Fixes for gcc-6
Thanks Jon for the ebuild and patch
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=598424
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'sys-block/thin-provisioning-tools/files')
| -rw-r--r-- | sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.6.3-build-fixes.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.6.3-build-fixes.patch b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.6.3-build-fixes.patch new file mode 100644 index 000000000000..ae1148a1626f --- /dev/null +++ b/sys-block/thin-provisioning-tools/files/thin-provisioning-tools-0.6.3-build-fixes.patch @@ -0,0 +1,57 @@ +diff -purN a/Makefile.in b/Makefile.in +--- a/Makefile.in 2016-07-21 15:42:52.000000000 +0100 ++++ b/Makefile.in 2016-10-28 22:45:54.292931031 +0100 +@@ -108,7 +108,7 @@ CFLAGS?=@CFLAGS@ + CFLAGS+=-Wall + CFLAGS+=@LFS_FLAGS@ + CXXFLAGS?=@CXXFLAGS@ +-CXXFLAGS+=-Wall -fno-strict-aliasing -std=gnu++98 ++CXXFLAGS+=-Wall -fno-strict-aliasing + CXXFLAGS+=@CXXOPTIMISE_FLAG@ + CXXFLAGS+=@CXXDEBUG_FLAG@ + CXXFLAGS+=@CXX_STRERROR_FLAG@ +diff -purN a/thin-provisioning/restore_emitter.cc b/thin-provisioning/restore_emitter.cc +--- a/thin-provisioning/restore_emitter.cc 2016-07-21 15:42:52.000000000 +0100 ++++ b/thin-provisioning/restore_emitter.cc 2016-10-28 22:49:32.662189111 +0100 +@@ -142,7 +142,7 @@ namespace { + bool device_exists(thin_dev_t dev) const { + uint64_t key[1] = {dev}; + device_tree::maybe_value v = md_->details_->lookup(key); +- return v; ++ return v.is_initialized(); + } + + metadata::ptr md_; +diff -purN a/thin-provisioning/thin_pool.cc b/thin-provisioning/thin_pool.cc +--- a/thin-provisioning/thin_pool.cc 2016-07-21 15:42:52.000000000 +0100 ++++ b/thin-provisioning/thin_pool.cc 2016-10-28 22:50:26.999256645 +0100 +@@ -232,7 +232,7 @@ bool + thin_pool::device_exists(thin_dev_t dev) const + { + uint64_t key[1] = {dev}; +- return md_->details_->lookup(key); ++ return md_->details_->lookup(key).is_initialized(); + } + + //---------------------------------------------------------------- +diff -purN a/unit-tests/Makefile.in b/unit-tests/Makefile.in +--- a/unit-tests/Makefile.in 2016-07-21 15:42:52.000000000 +0100 ++++ b/unit-tests/Makefile.in 2016-10-28 22:45:20.985893955 +0100 +@@ -25,7 +25,7 @@ GMOCK_FLAGS=\ + -Wno-unused-local-typedefs + + GMOCK_LIBS=\ +- -Llib -lpdata -lgmock -lpthread -laio ++ -Llib -lpdata -lgmock -lpthread -laio -lgtest + + GMOCK_DEPS=\ + $(wildcard $(GMOCK_DIR)/include/*.h) \ +@@ -80,7 +80,7 @@ TEST_OBJECTS=$(subst .cc,.gmo,$(TEST_SOU + sed 's,\([^ :]*\)\.o[ :]*,\1.o \1.gmo $* : Makefile ,g' < $*.$$$$ > $*.d; \ + $(RM) $*.$$$$ + +-unit-tests/unit_tests: $(TEST_OBJECTS) lib/libgmock.a lib/libpdata.a ++unit-tests/unit_tests: $(TEST_OBJECTS) lib/libpdata.a + @echo " [LD] $<" + $(V)g++ $(CXXFLAGS) $(LDFLAGS) -o $@ $(TEST_OBJECTS) $(LIBS) $(GMOCK_LIBS) $(LIBEXPAT) + |