summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2018-11-21 14:57:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-22 12:02:57 +0000
commit6460e97d929e6385acd0039c4ae1a0881631de0f (patch)
tree34e3912d048ed4c8d3ea387d16edd07f2f763b88
parent33dbdd91cf327b3ef4c3ce484fc746c31876b706 (diff)
downloadpoky-6460e97d929e6385acd0039c4ae1a0881631de0f.tar.gz
libcomps: add a patch to fix the missing crc32 symbol error under musl
(From OE-Core rev: 73faaea3cc0f26052cd4e2422106c6243fb676b1) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch47
-rw-r--r--meta/recipes-devtools/libcomps/libcomps_git.bb1
2 files changed, 48 insertions, 0 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
new file mode 100644
index 0000000000..ff90269a23
--- /dev/null
+++ b/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch
@@ -0,0 +1,47 @@
1From 83407aa50e06d967d0a1095a140bd7b0e5d51d27 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 21 Nov 2018 13:09:05 +0100
4Subject: [PATCH] Add crc32.c to sources list
5
6Otherwise, there is a missing symbol runtime error under musl C library.
7
8Upstream-Status: Pending
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 libcomps/src/python/src/CMakeLists.txt | 4 ++--
12 libcomps/src/python/src/crc32.c | 2 +-
13 2 files changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt
16index 6ed25bb..c15c8b2 100644
17--- a/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})
20 set (pycomps_SRC pycomps.c pycomps_sequence.c
21 pycomps_envs.c pycomps_categories.c pycomps_groups.c
22 pycomps_gids.c pycomps_utils.c pycomps_dict.c pycomps_mdict.c
23- pycomps_hash.c pycomps_exc.c pycomps_lbw.c)
24+ pycomps_hash.c pycomps_exc.c pycomps_lbw.c crc32.c)
25
26 set (pycomps_HEADERS pycomps_23macros.h pycomps_sequence.h
27 pycomps_envs.h pycomps_categories.h pycomps_groups.h
28 pycomps_gids.h pycomps_utils.h pycomps_dict.h pycomps_mdict.h
29 pycomps_hash.h pycomps_exc.h pycomps_lbw.h
30- pycomps_types.h)
31+ pycomps_types.h crc32.h)
32
33 #set(TEST_FILES ../__init__.py __test.py test_merge_comps.py test_libcomps.py
34 # utest.py)
35diff --git a/libcomps/src/python/src/crc32.c b/libcomps/src/python/src/crc32.c
36index d8f5e34..f266067 100644
37--- a/libcomps/src/python/src/crc32.c
38+++ b/libcomps/src/python/src/crc32.c
39@@ -41,7 +41,7 @@
40 */
41
42 #include <sys/param.h>
43-#include <sys/systm.h>
44+#include <stdint.h>
45
46 static uint32_t crc32_tab[] = {
47 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
diff --git a/meta/recipes-devtools/libcomps/libcomps_git.bb b/meta/recipes-devtools/libcomps/libcomps_git.bb
index e69bf67729..a0b6767b3d 100644
--- a/meta/recipes-devtools/libcomps/libcomps_git.bb
+++ b/meta/recipes-devtools/libcomps/libcomps_git.bb
@@ -6,6 +6,7 @@ SRC_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 \ 7 file://0002-Set-library-installation-path-correctly.patch \
8 file://0001-Make-__comps_objmrtree_all-static-inline.patch \ 8 file://0001-Make-__comps_objmrtree_all-static-inline.patch \
9 file://0001-Add-crc32.c-to-sources-list.patch \
9 " 10 "
10 11
11PV = "0.1.8+git${SRCPV}" 12PV = "0.1.8+git${SRCPV}"