diff options
-rw-r--r-- | recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Fix-library-path-for-multilib-setups.patch | 25 | ||||
-rw-r--r-- | recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb | 5 |
2 files changed, 2 insertions, 28 deletions
diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Fix-library-path-for-multilib-setups.patch b/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Fix-library-path-for-multilib-setups.patch deleted file mode 100644 index 1e37bf55..00000000 --- a/recipes-connectivity/libconnman-qt/libconnman-qt5/0001-Fix-library-path-for-multilib-setups.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From 9692239a31f0e47ea75b60388d5491d5155a888d Mon Sep 17 00:00:00 2001 | ||
2 | From: Andreas Oberritter <obi@saftware.de> | ||
3 | Date: Mon, 17 Dec 2018 14:00:44 +0100 | ||
4 | Subject: [PATCH] Fix library path for multilib setups. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Andreas Oberritter <obi@saftware.de> | ||
9 | --- | ||
10 | libconnman-qt/libconnman-qt.pro | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/libconnman-qt/libconnman-qt.pro b/libconnman-qt/libconnman-qt.pro | ||
14 | index 8cd58e8..bad8a5e 100644 | ||
15 | --- a/libconnman-qt/libconnman-qt.pro | ||
16 | +++ b/libconnman-qt/libconnman-qt.pro | ||
17 | @@ -71,7 +71,7 @@ SOURCES += \ | ||
18 | networksession.cpp \ | ||
19 | counter.cpp | ||
20 | |||
21 | -target.path = $$INSTALL_ROOT$$PREFIX/lib | ||
22 | +target.path = $$[QT_INSTALL_LIBS] | ||
23 | |||
24 | headers.files = $$PUBLIC_HEADERS | ||
25 | |||
diff --git a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb index f9fa27cd..06e3bbd4 100644 --- a/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb +++ b/recipes-connectivity/libconnman-qt/libconnman-qt5_git.bb | |||
@@ -5,12 +5,11 @@ HOMEPAGE = "https://git.merproject.org/mer-core/libconnman-qt" | |||
5 | LICENSE = "Apache-2.0" | 5 | LICENSE = "Apache-2.0" |
6 | LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88" | 6 | LIC_FILES_CHKSUM = "file://libconnman-qt/clockmodel.h;endline=8;md5=ea9f724050803f15d2d900ce3c5dac88" |
7 | DEPENDS += "qtbase qtdeclarative" | 7 | DEPENDS += "qtbase qtdeclarative" |
8 | PV = "1.2.7+git${SRCPV}" | 8 | PV = "1.2.34+git${SRCPV}" |
9 | 9 | ||
10 | SRCREV = "ad7fef1c35a3e897913965f73b879a14d65043dd" | 10 | SRCREV = "a0b6b0d9a63f28ab41747892f415c89866d62e4a" |
11 | SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https \ | 11 | SRC_URI = "git://git.merproject.org/mer-core/libconnman-qt.git;protocol=https \ |
12 | file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \ | 12 | file://0001-Don-t-use-MeeGo-as-prefix-in-order-to-make-this-a-co.patch \ |
13 | file://0001-Fix-library-path-for-multilib-setups.patch \ | ||
14 | " | 13 | " |
15 | 14 | ||
16 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |