mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

libcomps: upgrade 0.1.10 -> 0.1.11

Browse Source 
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>
This commit is contained in:
Alexander Kanavin
2019-04-15 12:54:46 +02:00
committed by Richard Purdie
parent 8987cf8a11
commit a8ede5f6c1
2 changed files with 2 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
meta/recipes-devtools/libcomps/libcomps/0002-Set-library-installation-path-correctly.patch
View File

@@ -1,27 +0,0 @@
From b1f61296e2f16c2b9a39c5501e4538628ff01ab4 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 30 Dec 2016 18:26:00 +0200
Subject: [PATCH 2/2] Set library installation path correctly
Upstream-Status: Submitted [https://github.com/rpm-software-management/libcomps/pull/32]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
libcomps/src/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libcomps/src/CMakeLists.txt b/libcomps/src/CMakeLists.txt
index e553d77..e2eef9c 100644
--- a/libcomps/src/CMakeLists.txt
+++ b/libcomps/src/CMakeLists.txt
@@ -52,7 +52,7 @@ add_dependencies(libcomps src-copy)
IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
SET (LIB_SUFFIX "64")
ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
-set (LIB_INST_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+set (LIB_INST_DIR ${CMAKE_INSTALL_LIBDIR})
install (FILES ${libcomps_HEADERS} DESTINATION include/libcomps)
--
2.11.0

5
meta/recipes-devtools/libcomps/libcomps_git.bb
View File

@@ -4,13 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
SRC_URI = "git://github.com/rpm-software-management/libcomps.git \
file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
file://0002-Set-library-installation-path-correctly.patch \
file://0001-Make-__comps_objmrtree_all-static-inline.patch \
file://0001-Add-crc32.c-to-sources-list.patch \
"
PV = "0.1.10"
SRCREV = "86a82fcd155c27092340d15a34f5c75c4da88243"
PV = "0.1.11"
SRCREV = "d868a79b76fb980d1371c28124ae07f00d2b63a9"
S = "${WORKDIR}/git"