diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-11-27 10:53:48 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-29 23:07:10 +0000 |
commit | 8a5e34ff78fc74bce16b7aae173f047fce88dee5 (patch) | |
tree | 85c0ed924dc0f45aa31b7a9949149672b9d5acc3 /meta/recipes-devtools/libcomps | |
parent | 762a20b493cc219a46d9ac188fe4895a111ee7b4 (diff) | |
download | openembedded-core-8a5e34ff78fc74bce16b7aae173f047fce88dee5.tar.gz |
libcomps: remove unneeded patch
Somewhere along the way the issue was fixed upstream.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libcomps')
-rw-r--r-- | meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch | 50 | ||||
-rw-r--r-- | meta/recipes-devtools/libcomps/libcomps_0.1.18.bb | 1 |
2 files changed, 0 insertions, 51 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 deleted file mode 100644 index 76fce19767..0000000000 --- a/meta/recipes-devtools/libcomps/libcomps/0001-Add-crc32.c-to-sources-list.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 72065bb2b5881dc224299f302379391aebdfca3d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Wed, 21 Nov 2018 13:09:05 +0100 -Subject: [PATCH 1/2] Add crc32.c to sources list - -Otherwise, there is a missing symbol runtime error under musl C library. - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - libcomps/src/python/src/CMakeLists.txt | 4 ++-- - libcomps/src/python/src/crc32.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libcomps/src/python/src/CMakeLists.txt b/libcomps/src/python/src/CMakeLists.txt -index 89b9c91..08cd6b5 100644 ---- a/libcomps/src/python/src/CMakeLists.txt -+++ b/libcomps/src/python/src/CMakeLists.txt -@@ -9,13 +9,13 @@ set (pycomps_SRCDIR ${CMAKE_CURRENT_SOURCE_DIR}) - set (pycomps_SRC pycomps.c pycomps_sequence.c - pycomps_envs.c pycomps_categories.c pycomps_groups.c - pycomps_gids.c pycomps_utils.c pycomps_dict.c pycomps_mdict.c -- pycomps_hash.c pycomps_exc.c pycomps_lbw.c) -+ pycomps_hash.c pycomps_exc.c pycomps_lbw.c crc32.c) - - set (pycomps_HEADERS pycomps_macros.h pycomps_sequence.h - pycomps_envs.h pycomps_categories.h pycomps_groups.h - pycomps_gids.h pycomps_utils.h pycomps_dict.h pycomps_mdict.h - pycomps_hash.h pycomps_exc.h pycomps_lbw.h -- pycomps_types.h) -+ pycomps_types.h crc32.h) - - #set(TEST_FILES ../__init__.py __test.py test_merge_comps.py test_libcomps.py - # utest.py) -diff --git a/libcomps/src/python/src/crc32.c b/libcomps/src/python/src/crc32.c -index d8f5e34..f266067 100644 ---- a/libcomps/src/python/src/crc32.c -+++ b/libcomps/src/python/src/crc32.c -@@ -41,7 +41,7 @@ - */ - - #include <sys/param.h> --#include <sys/systm.h> -+#include <stdint.h> - - static uint32_t crc32_tab[] = { - 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, --- -2.25.1 - diff --git a/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb b/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb index 3fd4d5b83d..ff6ecc7601 100644 --- a/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb +++ b/meta/recipes-devtools/libcomps/libcomps_0.1.18.bb @@ -5,7 +5,6 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "git://github.com/rpm-software-management/libcomps.git;branch=master;protocol=https \ - file://0001-Add-crc32.c-to-sources-list.patch \ file://0002-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ " |