Misc Fixes
cover Misc Fixes
Musl has some important fixes
distutils fix is taking care of some missed flags for C/C++ plugins, helps builds with PIE/PIC Systemd patch fix is found out by clang
The following changes since commit 0791c4d39edbedaa493a9fc6aa6e7415f14980bb:
utils.bbclass: fix KeyError exception (2018-08-24 07:53:09 +0100)
are available in the Git repository at:
git://git.openembedded.org/openembedded-core-contrib kraj/pu
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=kraj/pu
Khem Raj (3):
distutils-common-base.bbclass: Define commonly used compiler variables
systemd: Fix qsort_r patch for function return mismatch
musl: Update to latest
meta/classes/distutils-common-base.bbclass | 12 ++++++++++++ meta/recipes-core/musl/musl_git.bb | 2 +- .../0002-don-t-use-glibc-specific-qsort_r.patch | 16 ++++++++-------- 3 files changed, 21 insertions(+), 9 deletions(-)
Signature · 1 line
2.18.0
PATCH 1/3 distutils-common-base.bbclass: Define commonly used compiler variables
This is inspired from
https://github.com/python/cpython/blob/master/configure.ac
Helps cross compiling python C modules in some cases where they do not respect normal CFLAGS
Errors like using gcc to link when compiler is clang is fixed
--- meta/classes/distutils-common-base.bbclass | 12 ++++++++++++ 1 file changed, 12 insertions(+)
meta/classes/distutils-common-base.bbclass +12 -0
@@ -1,6 +1,18 @@ export STAGING_INCDIR export STAGING_LIBDIR +# LDSHARED is the ld *command* used to create shared library +export LDSHARED = "${CCLD} -shared" +# LDXXSHARED is the ld *command* used to create shared library of C++ +# objects +export LDCXXSHARED = "${CXX} -shared" +# CCSHARED are the C *flags* used to create objects to go into a shared +# library (module) +export CCSHARED = "-fPIC -DPIC" +# LINKFORSHARED are the flags passed to the $(CC) command that links +# the python executable +export LINKFORSHARED = "{SECURITY_CFLAGS} -Xlinker -export-dynamic" + FILES_${PN} += "${libdir}/* ${libdir}/${PYTHON_DIR}/*" FILES_${PN}-staticdev += "\
Signature · 1 line
2.18.0
PATCH 2/3 systemd: Fix qsort_r patch for function return mismatch
In reply to Khem Rajclang is fussy and complains that a valueless return is used from a function which should return a value
--- .../0002-don-t-use-glibc-specific-qsort_r.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch +8 -8
@@ -1,7 +1,7 @@ -From d43faf6d253db789225b7c454c8f255fbc68857e Mon Sep 17 00:00:00 2001 +From d74a4de6daea5a511c2b5636bbb552c15b3a4ad9 Mon Sep 17 00:00:00 2001 From: Emil Renner Berthing <[email protected]> Date: Thu, 18 Sep 2014 15:24:56 +0200 -Subject: [PATCH 02/19] don't use glibc-specific qsort_r +Subject: [PATCH] don't use glibc-specific qsort_r Upstream-Status: Inappropriate [musl specific]
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <[email protected]> 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/src/basic/format-table.c b/src/basic/format-table.c -index 94e796d1c..f7b4eade9 100644 +index 94e796d1ca..9b3f35c29a 100644 --- a/src/basic/format-table.c +++ b/src/basic/format-table.c @@ -745,29 +745,29 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t
@@ -63,7 +63,7 @@ index 94e796d1c..f7b4eade9 100644 - qsort_r_safe(sorted, n_rows, sizeof(size_t), table_data_compare, t); + if (n_rows <= 1) -+ return; ++ return 0; + assert(sorted); + user_table = t; + qsort(sorted, n_rows, sizeof(size_t), table_data_compare);
@@ -72,7 +72,7 @@ index 94e796d1c..f7b4eade9 100644 if (t->display_map) diff --git a/src/basic/util.h b/src/basic/util.h -index 9699d228f..40eaf518c 100644 +index 9699d228f9..40eaf518cb 100644 --- a/src/basic/util.h +++ b/src/basic/util.h @@ -105,13 +105,6 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, comparison_
@@ -90,7 +90,7 @@ index 9699d228f..40eaf518c 100644 /** * Normal memcpy requires src to be nonnull. We do nothing if n is 0. diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c -index 317cad8a6..701d59a1e 100644 +index 317cad8a67..701d59a1eb 100644 --- a/src/hwdb/hwdb.c +++ b/src/hwdb/hwdb.c @@ -135,13 +135,12 @@ static void trie_free(struct trie *trie) {
@@ -135,7 +135,7 @@ index 317cad8a6..701d59a1e 100644 } diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c -index 02408a428..491d367d1 100644 +index 02408a4285..491d367d12 100644 --- a/src/udev/udevadm-hwdb.c +++ b/src/udev/udevadm-hwdb.c @@ -114,13 +114,13 @@ static void trie_node_cleanup(struct trie_node *node) {
@@ -179,5 +179,5 @@ index 02408a428..491d367d1 100644 } -- -2.11.0 +2.18.0
Signature · 1 line
2.18.0
PATCH 3/3 musl: Update to latest
In reply to Khem RajImportant regression fixes for mips and pthreads
--- meta/recipes-core/musl/musl_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/musl/musl_git.bb +1 -1
@@ -3,7 +3,7 @@ require musl.inc -SRCREV = "1ad8138819ced49851e618c9c063aa0ffc86718c" +SRCREV = "767f7a1091af3a3dcee2f7a49d0713359a81961c" PV = "1.1.19+git${SRCPV}"
Signature · 1 line
2.18.0