From 076f5109b578c37ce648a9d1b547e65e9d6d97b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 25 Jun 2021 21:59:34 +0200 Subject: [PATCH] lsp-plugins: Remove our gconv hack for glibc and use it for musl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And ad more crap for the sake of building with musl Signed-off-by: Andreas Müller (cherry picked from commit f070cebf03e578543adeb27f93433ec026cf492b) --- recipes-musicians/lsp-plugins/lsp-plugins.bb | 15 ++++++++- ...-remove-runtime-charset-conversions.patch} | 18 +++++------ .../musl/0002-Fix-build-with-musl.patch | 32 +++++++++++++++++++ 3 files changed, 54 insertions(+), 11 deletions(-) rename recipes-musicians/lsp-plugins/lsp-plugins/{0003-Hack-remove-runtime-charset-conversions.patch => musl/0001-Hack-remove-runtime-charset-conversions.patch} (83%) create mode 100644 recipes-musicians/lsp-plugins/lsp-plugins/musl/0002-Fix-build-with-musl.patch diff --git a/recipes-musicians/lsp-plugins/lsp-plugins.bb b/recipes-musicians/lsp-plugins/lsp-plugins.bb index 04146b3..91b5c7b 100644 --- a/recipes-musicians/lsp-plugins/lsp-plugins.bb +++ b/recipes-musicians/lsp-plugins/lsp-plugins.bb @@ -20,7 +20,11 @@ DEPENDS += " \ SRC_URI += " \ file://0001-Makefile-align-for-oe-cross-build.patch \ file://0002-Pass-LDFLAGS-to-so-lib-builds.patch \ - file://0003-Hack-remove-runtime-charset-conversions.patch \ +" +# musl is CORRECT and causing nothing but waste of resources +SRC_URI_append_libc-musl = " \ + file://musl/0001-Hack-remove-runtime-charset-conversions.patch \ + file://musl/0002-Fix-build-with-musl.patch \ " ARM_INSTRUCTION_SET = "arm" @@ -77,3 +81,12 @@ FILES_${PN} += " \ PACKAGES =+ "${PN}-standalone" FILES_${PN}-standalone = "${bindir}" + +# lsp-plugins (and maybe others) need a gconv cache for target use of iconv +# see https://github.com/sadko4u/lsp-plugins/issues/17#issuecomment-487416107 +RDEPENDS_${PN}_append_libc-glibc += " \ + glibc-gconv glibc-gconvs glibc-utils \ +" +pkg_postinst_ontarget_${PN}_append_libc-glibc() { + iconvconfig +} diff --git a/recipes-musicians/lsp-plugins/lsp-plugins/0003-Hack-remove-runtime-charset-conversions.patch b/recipes-musicians/lsp-plugins/lsp-plugins/musl/0001-Hack-remove-runtime-charset-conversions.patch similarity index 83% rename from recipes-musicians/lsp-plugins/lsp-plugins/0003-Hack-remove-runtime-charset-conversions.patch rename to recipes-musicians/lsp-plugins/lsp-plugins/musl/0001-Hack-remove-runtime-charset-conversions.patch index fe0d7e4..d69e9c0 100644 --- a/recipes-musicians/lsp-plugins/lsp-plugins/0003-Hack-remove-runtime-charset-conversions.patch +++ b/recipes-musicians/lsp-plugins/lsp-plugins/musl/0001-Hack-remove-runtime-charset-conversions.patch @@ -1,4 +1,4 @@ -From b8d6bc13a68a78dc026db863cbc7103bbb584afe Mon Sep 17 00:00:00 2001 +From bc8d07b9f2c0bab4ec66023d9c925539bdc09f63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 28 Apr 2019 22:17:48 +0200 Subject: [PATCH] Hack: remove runtime charset conversions @@ -10,15 +10,16 @@ There are no charsets installed yet and I have no idea which are required. So treat all texts as UTF-8. Signed-off-by: Andreas Müller + --- src/core/LSPString.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/core/LSPString.cpp b/src/core/LSPString.cpp -index 8e0d72af..e8cf00ff 100644 +index 44174cff..8ed9c1b5 100644 --- a/src/core/LSPString.cpp +++ b/src/core/LSPString.cpp -@@ -1418,7 +1418,8 @@ namespace lsp +@@ -1651,7 +1651,8 @@ namespace lsp return true; } @@ -28,7 +29,7 @@ index 8e0d72af..e8cf00ff 100644 LSPString temp; // Open conversion -@@ -1479,7 +1480,7 @@ namespace lsp +@@ -1712,7 +1713,7 @@ namespace lsp // Close descriptor iconv_close(cd); @@ -37,7 +38,7 @@ index 8e0d72af..e8cf00ff 100644 return true; } #endif /* PLATFORM_WINDOWS */ -@@ -1641,7 +1642,9 @@ namespace lsp +@@ -1878,7 +1879,9 @@ namespace lsp if (first >= last) return (last == first) ? "" : NULL; @@ -47,8 +48,8 @@ index 8e0d72af..e8cf00ff 100644 +/* // Open conversion iconv_t cd = init_iconv_from_wchar_t(charset); if (cd == iconv_t(-1)) - return NULL; -@@ -1703,7 +1706,7 @@ namespace lsp + return get_utf8(first, last); +@@ -1940,7 +1943,7 @@ namespace lsp if (!append_temp("\x00\x00\x00\x00", 4)) return NULL; @@ -57,6 +58,3 @@ index 8e0d72af..e8cf00ff 100644 } #endif /* PLATFORM_WINDOWS */ --- -2.20.1 - diff --git a/recipes-musicians/lsp-plugins/lsp-plugins/musl/0002-Fix-build-with-musl.patch b/recipes-musicians/lsp-plugins/lsp-plugins/musl/0002-Fix-build-with-musl.patch new file mode 100644 index 0000000..ecf1dbd --- /dev/null +++ b/recipes-musicians/lsp-plugins/lsp-plugins/musl/0002-Fix-build-with-musl.patch @@ -0,0 +1,32 @@ +From 436b33a805714d9030543b5617885701761488bc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 25 Jun 2021 21:41:24 +0200 +Subject: [PATCH] Fix build with musl +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +| /include/data/cvector.h:415:24: error: 'ssize_t' does not name a type; did you mean 'size_t'? + +Upstream-Status: Inappropriate[musl] + +Signed-off-by: Andreas Müller +--- + include/data/cvector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/data/cvector.h b/include/data/cvector.h +index eccc94a6..d8a2b7d1 100644 +--- a/include/data/cvector.h ++++ b/include/data/cvector.h +@@ -22,6 +22,7 @@ + #ifndef DATA_CVECTOR_H_ + #define DATA_CVECTOR_H_ + ++#include + #include + #include + #include +-- +2.31.1 +