summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch9
-rw-r--r--meta/recipes-devtools/libcomps/libcomps/0001-Make-__comps_objmrtree_all-static-inline.patch35
-rw-r--r--meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch (renamed from meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch)12
-rw-r--r--meta/recipes-devtools/libcomps/libcomps_0.1.15.bb (renamed from meta/recipes-devtools/libcomps/libcomps_git.bb)6
4 files changed, 15 insertions, 47 deletions
diff --git a/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch b/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch
index ff90269a23..f4fb6d3b20 100644
--- a/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch
+++ b/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch
@@ -1,7 +1,7 @@
1From 83407aa50e06d967d0a1095a140bd7b0e5d51d27 Mon Sep 17 00:00:00 2001 1From 72065bb2b5881dc224299f302379391aebdfca3d Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 21 Nov 2018 13:09:05 +0100 3Date: Wed, 21 Nov 2018 13:09:05 +0100
4Subject: [PATCH] Add crc32.c to sources list 4Subject: [PATCH 1/2] Add crc32.c to sources list
5 5
6Otherwise, there is a missing symbol runtime error under musl C library. 6Otherwise, there is a missing symbol runtime error under musl C library.
7 7
@@ -13,7 +13,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 2 files changed, 3 insertions(+), 3 deletions(-) 13 2 files changed, 3 insertions(+), 3 deletions(-)
14 14
15diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt 15diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt
16index 6ed25bb..c15c8b2 100644 16index adabb31..b9b96ab 100644
17--- a/libcomps/src/python/src/CMakeLists.txt 17--- a/libcomps/src/python/src/CMakeLists.txt
18+++ b/libcomps/src/python/src/CMakeLists.txt 18+++ b/libcomps/src/python/src/CMakeLists.txt
19@@ -9,13 +9,13 @@ set (pycomps_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}) 19@@ -9,13 +9,13 @@ set (pycomps_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR})
@@ -45,3 +45,6 @@ index d8f5e34..f266067 100644
45 45
46 static uint32_t crc32_tab[] = { 46 static uint32_t crc32_tab[] = {
47 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 47 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
48--
492.26.2
50
diff --git a/meta/recipes-devtools/libcomps/libcomps/0001-Make-__comps_objmrtree_all-static-inline.patch b/meta/recipes-devtools/libcomps/libcomps/0001-Make-__comps_objmrtree_all-static-inline.patch
deleted file mode 100644
index 88469fb331..0000000000
--- a/meta/recipes-devtools/libcomps/libcomps/0001-Make-__comps_objmrtree_all-static-inline.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 91a324f8771818b81017fdf4daaad0c8c4b6987c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 20 Mar 2017 11:38:54 -0700
4Subject: [PATCH] Make __comps_objmrtree_all() static inline
5
6This helps compilers to scope the symbol correctly
7and apply the inlining optimizations, clang e.g.
8emits the functions and calls in code which is
9suboptimal, therefore give a little help to compiler
10this function is not used anywhere else to have
11a global scope.
12
13Upstream-Status: Pending
14
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 libcomps/src/comps_objmradix.c | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/libcomps/src/comps_objmradix.c b/libcomps/src/comps_objmradix.c
21index 9be6648..55f7793 100644
22--- a/libcomps/src/comps_objmradix.c
23+++ b/libcomps/src/comps_objmradix.c
24@@ -604,7 +604,7 @@ inline void comps_objmrtree_pair_destroy_v(void * pair) {
25 free(pair);
26 }
27
28-inline COMPS_HSList* __comps_objmrtree_all(COMPS_ObjMRTree * rt, char keyvalpair) {
29+static inline COMPS_HSList* __comps_objmrtree_all(COMPS_ObjMRTree * rt, char keyvalpair) {
30 COMPS_HSList *to_process, *ret;
31 COMPS_HSListItem *hsit, *oldit;
32 size_t x;
33--
342.12.0
35
diff --git a/meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
index 59c09aa70a..3e9102605b 100644
--- a/meta/recipes-devtools/libcomps/libcomps/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
+++ b/meta/recipes-devtools/libcomps/libcomps/0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
@@ -1,20 +1,19 @@
1From b28859ea93110d52d8a87d7b5a6c8796d0d523ed Mon Sep 17 00:00:00 2001 1From 32447a79e24f8e7e9e0150eb747f34116d63ef38 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 30 Dec 2016 18:22:09 +0200 3Date: Fri, 30 Dec 2016 18:22:09 +0200
4Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python. 4Subject: [PATCH 2/2] Do not set PYTHON_INSTALL_DIR by running python.
5 5
6Upstream-Status: Inappropriate [oe-core specific] 6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
9--- 8---
10 libcomps/src/python/src/CMakeLists.txt | 2 +- 9 libcomps/src/python/src/CMakeLists.txt | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
12 11
13diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt 12diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt
14index fa590ae..6913214 100644 13index b9b96ab..6d44567 100644
15--- a/libcomps/src/python/src/CMakeLists.txt 14--- a/libcomps/src/python/src/CMakeLists.txt
16+++ b/libcomps/src/python/src/CMakeLists.txt 15+++ b/libcomps/src/python/src/CMakeLists.txt
17@@ -117,7 +117,7 @@ IF (SKBUILD) 16@@ -115,7 +115,7 @@ IF (SKBUILD)
18 INSTALL(FILES libcomps/__init__.py DESTINATION libcomps/src/python/src/libcomps) 17 INSTALL(FILES libcomps/__init__.py DESTINATION libcomps/src/python/src/libcomps)
19 INSTALL(TARGETS pycomps LIBRARY DESTINATION libcomps/src/python/src/libcomps) 18 INSTALL(TARGETS pycomps LIBRARY DESTINATION libcomps/src/python/src/libcomps)
20 ELSE () 19 ELSE ()
@@ -23,3 +22,6 @@ index fa590ae..6913214 100644
23 22
24 INSTALL(FILES ${pycomps_SRCDIR}/libcomps/__init__.py DESTINATION ${PYTHON_INSTALL_DIR}/libcomps) 23 INSTALL(FILES ${pycomps_SRCDIR}/libcomps/__init__.py DESTINATION ${PYTHON_INSTALL_DIR}/libcomps)
25 #INSTALL(FILES ${pycomps_SRCDIR}/tests/__test.py DESTINATION 24 #INSTALL(FILES ${pycomps_SRCDIR}/tests/__test.py DESTINATION
25--
262.26.2
27
diff --git a/meta/recipes-devtools/libcomps/libcomps_git.bb b/meta/recipes-devtools/libcomps/libcomps_0.1.15.bb
index 40b60159bc..98c55dca85 100644
--- a/meta/recipes-devtools/libcomps/libcomps_git.bb
+++ b/meta/recipes-devtools/libcomps/libcomps_0.1.15.bb
@@ -3,13 +3,11 @@ LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 3LIC_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 \
7 file://0001-Make-__comps_objmrtree_all-static-inline.patch \
8 file://0001-Add-crc32.c-to-sources-list.patch \ 6 file://0001-Add-crc32.c-to-sources-list.patch \
7 file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
9 " 8 "
10 9
11PV = "0.1.14" 10SRCREV = "b213f749405d84e989b25e183bcf28ce701696dd"
12SRCREV = "5a0e04286f3462e3308f2a332eb0f90a66920218"
13 11
14S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
15 13