commit 7f5a33637bb10fba380071a216eecb5b4c10d4b8
author Patrick Williams <patrick@stwcx.xyz> Mon Jun 01 09:30:47 2020 -0500
committer Patrick Williams <patrick@stwcx.xyz> Tue Jun 02 05:31:33 2020 -0500
tree 31bd2baef98d4c5623c087d78ba2f208e2dce493
parent 8c505da0ffd8709f3c799a855ff921cfbd446201

sdbusplus: use meson build

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I2ba6002911b35dd67010d981aedaf25c0fc56fc0

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2ab9fa..f35603e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,12 +81,12 @@
     externalproject_add (sdbusplus-project PREFIX
                          ${CMAKE_BINARY_DIR}/sdbusplus-project GIT_REPOSITORY
                          https://github.com/openbmc/sdbusplus.git GIT_TAG
-                         80948b815c0fc6f474fc45ad28f6a373a8896831 SOURCE_DIR
+                         fa3137a78e952134559bf7c41c4f29fa4afabe02 SOURCE_DIR
                          ${CMAKE_BINARY_DIR}/sdbusplus-src BINARY_DIR
                          ${CMAKE_BINARY_DIR}/sdbusplus-build CONFIGURE_COMMAND
                          "" BUILD_COMMAND cd ${CMAKE_BINARY_DIR}/sdbusplus-src
-                         && ./bootstrap.sh && ./configure --enable-transaction
-                         && make -j libsdbusplus.la INSTALL_COMMAND ""
+                         && meson build -Ddefault_library=static && ninja -C
+                         build libsdbusplus.a INSTALL_COMMAND ""
                          LOG_DOWNLOAD ON)
 
     include_directories (SYSTEM ${CMAKE_BINARY_DIR}/sdbusplus-src)
@@ -95,7 +95,7 @@
     include_directories (SYSTEM ${CMAKE_BINARY_DIR}/valijson/include)
     include_directories (SYSTEM
                          ${CMAKE_BINARY_DIR}/phosphor-dbus-interfaces/include)
-    link_directories (${CMAKE_BINARY_DIR}/sdbusplus-src/.libs)
+    link_directories (${CMAKE_BINARY_DIR}/sdbusplus-src/build)
 
     include_directories (SYSTEM ${CMAKE_BINARY_DIR}/boost-src)
     set (CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/boost-src ${CMAKE_PREFIX_PATH})

build-sdbusplus.sh

diff --git a/build-sdbusplus.sh b/build-sdbusplus.sh
deleted file mode 100755
index dbf4824..0000000
--- a/build-sdbusplus.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -e
-if [ ! -d $MESON_BUILD_ROOT/sdbusplus ]; then
-    cp -r $MESON_SOURCE_ROOT/subprojects/sdbusplus $MESON_BUILD_ROOT
-    cd $MESON_BUILD_ROOT/sdbusplus
-    ./bootstrap.sh
-    ./configure --enable-transaction
-    make -j libsdbusplus.la
-fi

meson.build

diff --git a/meson.build b/meson.build
index 52337df..584c0f8 100644
--- a/meson.build
+++ b/meson.build
@@ -42,16 +42,8 @@
 endif
 sdbusplus = dependency('sdbusplus', required: false)
 if not sdbusplus.found()
-    subproject('sdbusplus', required: false)
-    run_command(find_program('build-sdbusplus.sh'), check: true)
-    sdbusplus = declare_dependency(
-        dependencies: dependency('libsystemd'),
-        include_directories: 'sdbusplus',
-        link_args: [
-            'sdbusplus/.libs/libsdbusplus.so',
-            '-Wl,-rpath,$ORIGIN/../sdbusplus/.libs'
-        ],
-    )
+    sdbusplus_proj = subproject('sdbusplus', required: true)
+    sdbusplus = sdbusplus_proj.get_variable('sdbusplus_dep')
 endif
 systemd = dependency('systemd')
 systemd_system_unit_dir = systemd.get_pkgconfig_variable(