From a83e308350c40ce5049169894ca26407e17ab140 Mon Sep 17 00:00:00 2001 From: Alexey Klimkin Date: Fri, 26 Mar 2021 10:39:18 -0700 Subject: [PATCH 1/3] Dummy --- recipes/libelfin/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libelfin/all/conanfile.py b/recipes/libelfin/all/conanfile.py index d53acbbfd0abe..c6574fae22a41 100644 --- a/recipes/libelfin/all/conanfile.py +++ b/recipes/libelfin/all/conanfile.py @@ -5,7 +5,7 @@ class LibelfinConan(ConanFile): name = "libelfin" - description = "C++11 library for reading ELF binaries and DWARFv4 debug information" + description = "C++11 library for reading ELF binaries and DWARFv4 debug information " url = "https://github.com/conan-io/conan-center-index" homepage = "https://github.com/aclements/libelfin" license = "MIT" From e2cb5c3967bfdb6a0c918b4ef9a9ec21769ecd6a Mon Sep 17 00:00:00 2001 From: Alexey Klimkin Date: Fri, 26 Mar 2021 11:50:42 -0700 Subject: [PATCH 2/3] Fix copilation with Clang 10 --- recipes/libelfin/all/conandata.yml | 2 ++ recipes/libelfin/all/conanfile.py | 2 +- recipes/libelfin/all/patches/const-fix.patch | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 recipes/libelfin/all/patches/const-fix.patch diff --git a/recipes/libelfin/all/conandata.yml b/recipes/libelfin/all/conandata.yml index 147f188cac1b2..135dbf87321a3 100644 --- a/recipes/libelfin/all/conandata.yml +++ b/recipes/libelfin/all/conandata.yml @@ -6,3 +6,5 @@ patches: "0.3": - patch_file: "patches/commit-9d0db16d0a0b3c4f8aaa60a3e4dab295df34b6b2.patch" base_path: "source_subfolder" + - patch_file: "patches/const-fix.patch" + base_path: "source_subfolder" diff --git a/recipes/libelfin/all/conanfile.py b/recipes/libelfin/all/conanfile.py index c6574fae22a41..d53acbbfd0abe 100644 --- a/recipes/libelfin/all/conanfile.py +++ b/recipes/libelfin/all/conanfile.py @@ -5,7 +5,7 @@ class LibelfinConan(ConanFile): name = "libelfin" - description = "C++11 library for reading ELF binaries and DWARFv4 debug information " + description = "C++11 library for reading ELF binaries and DWARFv4 debug information" url = "https://github.com/conan-io/conan-center-index" homepage = "https://github.com/aclements/libelfin" license = "MIT" diff --git a/recipes/libelfin/all/patches/const-fix.patch b/recipes/libelfin/all/patches/const-fix.patch new file mode 100644 index 0000000000000..08953c915ef21 --- /dev/null +++ b/recipes/libelfin/all/patches/const-fix.patch @@ -0,0 +1,19 @@ +commit 8d00031176c2025e53336992c1575d73b4f66b2b (smertig/fix_wrong_const) +Author: Smertig +Date: Sun Sep 6 20:19:00 2020 +0300 + + Remove const qualifier from setter + +diff --git a/elf/data.hh b/elf/data.hh +index ed5c7a1..4a60944 100644 +--- a/elf/data.hh ++++ b/elf/data.hh +@@ -553,7 +553,7 @@ struct Sym + return (stb)(info >> 4); + } + +- void set_binding(stb v) const ++ void set_binding(stb v) + { + info = (info & 0xF) | ((unsigned char)v << 4); + } From d399baa83a1ee069b631d2e86f049404ad0ec0df Mon Sep 17 00:00:00 2001 From: Alexey Klimkin Date: Fri, 26 Mar 2021 18:14:45 -0700 Subject: [PATCH 3/3] Update recipes/libelfin/all/conandata.yml Co-authored-by: Javier G. Sogo --- recipes/libelfin/all/conandata.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/libelfin/all/conandata.yml b/recipes/libelfin/all/conandata.yml index 135dbf87321a3..e1b6341e83185 100644 --- a/recipes/libelfin/all/conandata.yml +++ b/recipes/libelfin/all/conandata.yml @@ -8,3 +8,4 @@ patches: base_path: "source_subfolder" - patch_file: "patches/const-fix.patch" base_path: "source_subfolder" + # patch_source: https://github.com/aclements/libelfin/pull/54