[MESOS-5979] elfio-3.1.patch is actually not applied

• Type: Bug
• Status: Resolved
• Priority: Major
• Resolution: Fixed
• Fix Version/s: 1.1.0
• Component/s: build

Environment

Linux with Nvidia GPU

• Flags: Patch
• Assignee: Unassigned
• Reporter: UENISHI Kota
• Created: 03/Aug/16 09:53
• Updated: 29/Apr/19 09:26
• Resolved: 15/Aug/16 23:54

Description

This does not affect any released version, but affects the HEAD of 1.0.x branch and any commit after 89cfa6e. Due to this, mesos-agent will never be able start up when it tries to recognize GPU library that has .note.ABI-tag. The patch is tiny; I'll follow up with Review Board if needed.

$ cat ../apply-elfio-patch.patch 
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index b966e58..6dac5bd 100755
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -96,6 +96,8 @@ if (NOT WIN32)
   # under the C++11 standard. cf. MESOS-860, MESOS-966.
   PATCH_CMD(${MESOS_3RDPARTY_SRC}/glog-0.3.3.patch GLOG_PATCH_CMD)
 
+  PATCH_CMD(${MESOS_3RDPARTY_SRC}/elfio-3.1.patch ELFIO_PATCH_CMD)
+
   # NOTE: `libev` is "installed" into a lib directory, see "NOTE: (fix for
   # MESOS-3250)" comment above for explanation.
   set(LIBEV_CONFIG_CMD  ${LIBEV_ROOT}/configure --prefix=${LIBEV_ROOT}-lib)
@@ -153,6 +155,7 @@ ExternalProject_Add(
 ExternalProject_Add(
   ${ELFIO_TARGET}
   PREFIX            ${ELFIO_CMAKE_ROOT}
+  PATCH_COMMAND     ${ELFIO_PATCH_CMD}
   CONFIGURE_COMMAND ${CMAKE_NOOP}
   BUILD_COMMAND     ${CMAKE_NOOP}
   INSTALL_COMMAND   ${CMAKE_NOOP}

Issue Links

• relates to: MESOS-5767 Add ELFIO as bundled Dependency to Mesos