summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libcomps
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-04-15 12:54:46 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-16 11:10:02 +0100
commita8ede5f6c18f31af334ffd6bf6c4c4d946ee3733 (patch)
tree679685dfe37433e2810b90d66ade2894ea6b29b1 /meta/recipes-devtools/libcomps
parent8987cf8a11970698d85f59d726758782b9938c9f (diff)
downloadpoky-a8ede5f6c18f31af334ffd6bf6c4c4d946ee3733.tar.gz
libcomps: upgrade 0.1.10 -> 0.1.11
Remove upstreamed patch. (From OE-Core rev: 2fced6170a86fb5b411de0dcc458c5bc6714b56d) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libcomps')
-rw-r--r--meta/recipes-devtools/libcomps/libcomps/0002-Set-library-installation-path-correctly.patch27
-rw-r--r--meta/recipes-devtools/libcomps/libcomps_git.bb5
2 files changed, 2 insertions, 30 deletions
diff --git a/meta/recipes-devtools/libcomps/libcomps/0002-Set-library-installation-path-correctly.patch b/meta/recipes-devtools/libcomps/libcomps/0002-Set-library-installation-path-correctly.patch
deleted file mode 100644
index dc3d976352..0000000000
--- a/meta/recipes-devtools/libcomps/libcomps/0002-Set-library-installation-path-correctly.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From b1f61296e2f16c2b9a39c5501e4538628ff01ab4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 30 Dec 2016 18:26:00 +0200
4Subject: [PATCH 2/2] Set library installation path correctly
5
6Upstream-Status: Submitted [https://github.com/rpm-software-management/libcomps/pull/32]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 libcomps/src/CMakeLists.txt | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/libcomps/src/CMakeLists.txt b/libcomps/src/CMakeLists.txt
13index e553d77..e2eef9c 100644
14--- a/libcomps/src/CMakeLists.txt
15+++ b/libcomps/src/CMakeLists.txt
16@@ -52,7 +52,7 @@ add_dependencies(libcomps src-copy)
17 IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
18 SET (LIB_SUFFIX "64")
19 ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
20-set (LIB_INST_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
21+set (LIB_INST_DIR ${CMAKE_INSTALL_LIBDIR})
22
23
24 install (FILES ${libcomps_HEADERS} DESTINATION include/libcomps)
25--
262.11.0
27
diff --git a/meta/recipes-devtools/libcomps/libcomps_git.bb b/meta/recipes-devtools/libcomps/libcomps_git.bb
index ff6820851f..372c3c3580 100644
--- a/meta/recipes-devtools/libcomps/libcomps_git.bb
+++ b/meta/recipes-devtools/libcomps/libcomps_git.bb
@@ -4,13 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
4 4
5SRC_URI = "git://github.com/rpm-software-management/libcomps.git \ 5SRC_URI = "git://github.com/rpm-software-management/libcomps.git \
6 file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ 6 file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
7 file://0002-Set-library-installation-path-correctly.patch \
8 file://0001-Make-__comps_objmrtree_all-static-inline.patch \ 7 file://0001-Make-__comps_objmrtree_all-static-inline.patch \
9 file://0001-Add-crc32.c-to-sources-list.patch \ 8 file://0001-Add-crc32.c-to-sources-list.patch \
10 " 9 "
11 10
12PV = "0.1.10" 11PV = "0.1.11"
13SRCREV = "86a82fcd155c27092340d15a34f5c75c4da88243" 12SRCREV = "d868a79b76fb980d1371c28124ae07f00d2b63a9"
14 13
15S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
16 15