src_prepare/src_prepare-overlay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

app-emulation/anbox: update patch for live build

Browse Source 
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Alfred Wingate <parona@protonmail.com>
This commit is contained in:
Alfred Wingate 2021-03-21 16:27:52 +02:00
parent b665a08ff1
commit d0abf6713a
No known key found for this signature in database
GPG Key ID: A12750536B5E7010
2 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app-emulation/anbox/anbox-9999.ebuild
View File

@ -60,7 +60,7 @@ CONFIG_CHECK="
~TMPFS_XATTR
"
PATCHES=( ""${FILESDIR}"/no_bundled_sdbus.patch" )
PATCHES=( ""${FILESDIR}"/no_bundled_sdbus-r1.patch" )
pkg_pretend() {
if use !systemd; then

50
app-emulation/anbox/files/no_bundled_sdbus-r1.patch Normal file
View File

@ -0,0 +1,50 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 713df49..1e8b462 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,6 +59,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
find_package(Boost COMPONENTS filesystem log serialization system thread program_options)
find_package(PkgConfig)
find_package(Threads)
+find_package(SDBus-C++ REQUIRED)
find_package(EGL REQUIRED)
find_package(GLESv2 REQUIRED)
find_package(Protobuf REQUIRED)
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index f677aa0..265a2eb 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -6,12 +6,3 @@ add_subdirectory(backward-cpp)
set(BUILD_TESTING OFF)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
add_subdirectory(cpu_features EXCLUDE_FROM_ALL)
-include(ExternalProject)
-ExternalProject_Add(sdbus-cpp
- PREFIX sdbus-cpp
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sdbus-cpp"
- INSTALL_COMMAND ""
- CMAKE_CACHE_ARGS
- -DBUILD_CODE_GEN:BOOL=ON
- -DBUILD_SHARED_LIBS:BOOL=OFF
-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 796b881..a19da1b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,7 +26,6 @@ include_directories(
${CMAKE_SOURCE_DIR}/external/android-emugl/host/libs/renderControl_dec
${CMAKE_BINARY_DIR}/external/android-emugl/host/libs/renderControl_dec
${CMAKE_SOURCE_DIR}/external/cpu_features/include
- ${CMAKE_SOURCE_DIR}/external/sdbus-cpp/include
)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBINDERFS_PATH=\"\\\"${BINDERFS_PATH}\\\"\"")
@@ -59,7 +58,7 @@ add_library(anbox-protobuf
target_link_libraries(anbox-protobuf
${PROTOBUF_LITE_LIBRARIES})
-set(XML2CPP ${CMAKE_BINARY_DIR}/external/sdbus-cpp/src/sdbus-cpp-build/tools/sdbus-c++-xml2cpp)
+set(XML2CPP sdbus-c++-xml2cpp)
macro(DBusServer BaseName)
add_custom_command(