You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2016/08/15 18:03:29 UTC
mesos git commit: Updated elfio to version 3.2.
Repository: mesos
Updated Branches:
refs/heads/master b0aee8bc5 -> 3afef704d
Updated elfio to version 3.2.
Review: https://reviews.apache.org/r/51087/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3afef704
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3afef704
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3afef704
Branch: refs/heads/master
Commit: 3afef704d731825c351b1762da866b2749f90b6f
Parents: b0aee8b
Author: Kevin Klues <kl...@gmail.com>
Authored: Mon Aug 15 11:03:22 2016 -0700
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Mon Aug 15 11:03:22 2016 -0700
----------------------------------------------------------------------
3rdparty/Makefile.am | 5 -----
3rdparty/cmake/Versions.cmake | 2 +-
3rdparty/elfio-3.1.patch | 26 --------------------------
3rdparty/elfio-3.1.tar.gz | Bin 2619869 -> 0 bytes
3rdparty/elfio-3.2.tar.gz | Bin 0 -> 2621150 bytes
3rdparty/versions.am | 2 +-
6 files changed, 2 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/3afef704/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/Makefile.am b/3rdparty/Makefile.am
index 662146f..d12946c 100644
--- a/3rdparty/Makefile.am
+++ b/3rdparty/Makefile.am
@@ -76,11 +76,6 @@ EXTRA_DIST = \
$(WHEEL).tar.gz \
$(ZOOKEEPER).tar.gz
-# We need to patch ELFIO in order to deal with some off-by-one errors
-# in parsing the NOTE sections of a binary.
-EXTRA_DIST += \
- $(ELFIO).patch
-
# We need to patch glog in order to deal with a compilation issue when
# compiling with clang (and C++11); see MESOS-860, MESOS-966.
EXTRA_DIST += \
http://git-wip-us.apache.org/repos/asf/mesos/blob/3afef704/3rdparty/cmake/Versions.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/cmake/Versions.cmake b/3rdparty/cmake/Versions.cmake
index e5cf7d0..ad23f38 100644
--- a/3rdparty/cmake/Versions.cmake
+++ b/3rdparty/cmake/Versions.cmake
@@ -1,6 +1,6 @@
set(BOOST_VERSION "1.53.0")
set(CURL_VERSION "7.43.0")
-set(ELFIO_VERSION "3.1")
+set(ELFIO_VERSION "3.2")
set(GLOG_VERSION "0.3.3")
set(GMOCK_VERSION "1.7.0")
set(HTTP_PARSER_VERSION "2.6.2")
http://git-wip-us.apache.org/repos/asf/mesos/blob/3afef704/3rdparty/elfio-3.1.patch
----------------------------------------------------------------------
diff --git a/3rdparty/elfio-3.1.patch b/3rdparty/elfio-3.1.patch
deleted file mode 100644
index 3d85394..0000000
--- a/3rdparty/elfio-3.1.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Binary files elfio-3.1/elfio/.elfio_note.hpp.swp and elfio-3.1-repo/elfio/.elfio_note.hpp.swp differ
-diff -ruN elfio-3.1/elfio/elfio_note.hpp elfio-3.1-repo/elfio/elfio_note.hpp
---- elfio-3.1/elfio/elfio_note.hpp 2016-04-23 07:58:34.000000000 -0700
-+++ elfio-3.1-repo/elfio/elfio_note.hpp 2016-07-05 14:05:12.524951042 -0700
-@@ -66,7 +66,7 @@
- namesz + descSize > max_name_size ) {
- return false;
- }
-- name.assign( pData + 3 * sizeof( Elf_Word ), namesz );
-+ name.assign( pData + 3 * sizeof( Elf_Word ), namesz - 1);
- if ( 0 == descSize ) {
- desc = 0;
- }
-@@ -75,8 +75,10 @@
- if ( elf_file.get_class() == ELFCLASS32 ) {
- align = sizeof( Elf_Word );
- }
-- desc = const_cast<char*> ( pData + 3*sizeof( Elf_Word ) +
-- ( ( namesz + align - 1 ) / align ) * align );
-+
-+ size_t offset = ( ( 3*sizeof( Elf_Word ) + namesz + align - 1 ) / align ) * align;
-+
-+ desc = const_cast<char*> (pData + offset);
- }
-
- return true;
http://git-wip-us.apache.org/repos/asf/mesos/blob/3afef704/3rdparty/elfio-3.1.tar.gz
----------------------------------------------------------------------
diff --git a/3rdparty/elfio-3.1.tar.gz b/3rdparty/elfio-3.1.tar.gz
deleted file mode 100644
index c0e60f3..0000000
Binary files a/3rdparty/elfio-3.1.tar.gz and /dev/null differ
http://git-wip-us.apache.org/repos/asf/mesos/blob/3afef704/3rdparty/elfio-3.2.tar.gz
----------------------------------------------------------------------
diff --git a/3rdparty/elfio-3.2.tar.gz b/3rdparty/elfio-3.2.tar.gz
new file mode 100644
index 0000000..d3bd25d
Binary files /dev/null and b/3rdparty/elfio-3.2.tar.gz differ
http://git-wip-us.apache.org/repos/asf/mesos/blob/3afef704/3rdparty/versions.am
----------------------------------------------------------------------
diff --git a/3rdparty/versions.am b/3rdparty/versions.am
index 08e47b6..26f839c 100644
--- a/3rdparty/versions.am
+++ b/3rdparty/versions.am
@@ -20,7 +20,7 @@
# still need to update version numbers in src/python/setup.py.in too!
BOOST_VERSION = 1.53.0
-ELFIO_VERSION = 3.1
+ELFIO_VERSION = 3.2
GLOG_VERSION = 0.3.3
GMOCK_VERSION = 1.7.0
GPERFTOOLS_VERSION = 2.5