diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-10-02 11:21:03 +0100 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-10-02 06:27:29 -0700 |
commit | 23dc4f060f3d96af02c1c69d7b004352d79d7bb5 (patch) | |
tree | 3973bba9c305a2c28debd3b2408aa343e7c2fdd1 /meta-oe | |
parent | e9b3476ad9964210d5cdbce4d11b31b50738a4b6 (diff) | |
download | meta-openembedded-23dc4f060f3d96af02c1c69d7b004352d79d7bb5.tar.gz |
gattlib: Upgrade to latest
Drop upstreamed patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch | 53 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/gattlib/gattlib_git.bb | 7 |
2 files changed, 3 insertions, 57 deletions
diff --git a/meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch b/meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch deleted file mode 100644 index ffe0a0067..000000000 --- a/meta-oe/recipes-connectivity/gattlib/files/0001-cmake-Use-GNUInstallDirs.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | From 63dc2d0c9384d85482dc4cbb3c179b4b0bb18d4e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Thu, 19 Dec 2019 22:32:01 -0800 | ||
4 | Subject: [PATCH] cmake: Use GNUInstallDirs | ||
5 | |||
6 | Helps install cmakefiles in right libdir | ||
7 | |||
8 | Upstream-Status: Submitted [https://github.com/labapart/gattlib/pull/139] | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | CMakeLists.txt | 5 +++-- | ||
12 | dbus/CMakeLists.txt | 18 ++++++++++-------- | ||
13 | 2 files changed, 13 insertions(+), 10 deletions(-) | ||
14 | |||
15 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
16 | index 12d8d71..ded7239 100644 | ||
17 | --- a/CMakeLists.txt | ||
18 | +++ b/CMakeLists.txt | ||
19 | @@ -152,7 +152,8 @@ endif() | ||
20 | # | ||
21 | # List of file to install | ||
22 | # | ||
23 | -install(FILES include/gattlib.h DESTINATION include) | ||
24 | -install(FILES ${PROJECT_BINARY_DIR}/gattlib.pc DESTINATION lib/pkgconfig) | ||
25 | +include(GNUInstallDirs) | ||
26 | +install(FILES include/gattlib.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) | ||
27 | +install(FILES ${PROJECT_BINARY_DIR}/gattlib.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) | ||
28 | |||
29 | include(CPack) | ||
30 | diff --git a/dbus/CMakeLists.txt b/dbus/CMakeLists.txt | ||
31 | index f5096ce..cef031f 100644 | ||
32 | --- a/dbus/CMakeLists.txt | ||
33 | +++ b/dbus/CMakeLists.txt | ||
34 | @@ -19,7 +19,7 @@ | ||
35 | # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | ||
36 | # | ||
37 | |||
38 | -cmake_minimum_required(VERSION 2.6) | ||
39 | +cmake_minimum_required(VERSION 3.0) | ||
40 | |||
41 | find_package(PkgConfig REQUIRED) | ||
42 | |||
43 | @@ -119,4 +119,6 @@ endif() | ||
44 | add_library(gattlib SHARED ${gattlib_SRCS}) | ||
45 | target_link_libraries(gattlib ${gattlib_LIBS}) | ||
46 | |||
47 | -install(TARGETS gattlib LIBRARY DESTINATION lib) | ||
48 | +include(GNUInstallDirs) | ||
49 | + | ||
50 | +install(TARGETS gattlib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
51 | -- | ||
52 | 2.24.1 | ||
53 | |||
diff --git a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb index 8485013ba..ea4f4d546 100644 --- a/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb +++ b/meta-oe/recipes-connectivity/gattlib/gattlib_git.bb | |||
@@ -1,8 +1,8 @@ | |||
1 | DESCRIPTION = "Bluetooth library with attribute support" | 1 | DESCRIPTION = "Bluetooth library with attribute support" |
2 | SECTION = "libs/network" | 2 | SECTION = "libs/network" |
3 | 3 | ||
4 | LICENSE = "GPLv2+" | 4 | LICENSE = "GPL-2.0+ | BSD-3-Clause" |
5 | LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=20;md5=8d5efeb9189b60866baff80ff791bf00" | 5 | LIC_FILES_CHKSUM = "file://CMakeLists.txt;beginline=1;endline=6;md5=71fdd2be76b4e95fe28324a70d4981c5" |
6 | 6 | ||
7 | DEPENDS = "bluez5 glib-2.0" | 7 | DEPENDS = "bluez5 glib-2.0" |
8 | DEPENDS += "glib-2.0-native" | 8 | DEPENDS += "glib-2.0-native" |
@@ -11,11 +11,10 @@ PV = "0.2+git${SRCPV}" | |||
11 | 11 | ||
12 | SRC_URI = "git://github.com/labapart/gattlib.git \ | 12 | SRC_URI = "git://github.com/labapart/gattlib.git \ |
13 | file://dbus-avoid-strange-chars-from-the-build-dir.patch \ | 13 | file://dbus-avoid-strange-chars-from-the-build-dir.patch \ |
14 | file://0001-cmake-Use-GNUInstallDirs.patch \ | ||
15 | " | 14 | " |
16 | 15 | ||
17 | SRCBRANCH = "master" | 16 | SRCBRANCH = "master" |
18 | SRCREV = "5c7ee43bd70ee09a7170ddd55b9fdbdef69e9080" | 17 | SRCREV = "fa54ae42ccb3d8f911e00b02ed1e581537e47f79" |
19 | 18 | ||
20 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
21 | 20 | ||