Update bpf_conformance to latest

This PR combines #543 and #544
Also removes a redundant inclusion of the elfio library

Signed-off-by: Dave Thaler <[email protected]>

.gitmodules

@@ -4,9 +4,6 @@
 [submodule "external/radix_tree"]
 	path = external/radix_tree
 	url = https://github.com/ytakano/radix_tree
-[submodule "external/ELFIO"]
-	path = external/ELFIO
-	url = https://github.com/serge1/ELFIO.git
 [submodule "external/bpf_conformance"]
 	path = external/bpf_conformance
 	url = https://github.com/Alan-Jowett/bpf_conformance.git

CMakeLists.txt

@@ -37,7 +37,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
   if (NOT NUGET)
     message("ERROR: You must first install nuget.exe from https://www.nuget.org/downloads")
   else ()
-    execute_process(COMMAND ${NUGET} ARGS install "Boost" -Version 1.81.0 -ExcludeVersion -OutputDirectory ${CMAKE_BINARY_DIR}/packages)
+    execute_process(COMMAND ${NUGET} install "Boost" -Version 1.81.0 -ExcludeVersion -OutputDirectory ${CMAKE_BINARY_DIR}/packages)
     set(BOOST_VERSION 1.81.0)
   endif()
   set(Boost_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/packages/boost/lib/native/include)
@@ -62,7 +62,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 endif ()
 
 include_directories(./external)
-include_directories(./external/ELFIO)
+include_directories(./external/bpf_conformance/external/elfio)
 include_directories(./src)
 include_directories(./external/libbtf)
 include_directories(${Boost_INCLUDE_DIRS})
@@ -130,6 +130,7 @@ target_compile_options(ebpfverifier PUBLIC "$<$<CONFIG:DEBUG>:${DEBUG_FLAGS}>")
 target_compile_options(ebpfverifier PUBLIC "$<$<CONFIG:RELEASE>:${RELEASE_FLAGS}>")
 target_compile_options(ebpfverifier PUBLIC "$<$<CONFIG:SANITIZE>:${SANITIZE_FLAGS}>")
 
+add_subdirectory("external/bpf_conformance/external/elfio")
 add_subdirectory("external/bpf_conformance/src")
 add_subdirectory("external/libbtf")