* [PATCH v3 2/5] bsd-headers: Define __CONCAT and __STRING
2023-09-22 21:05 [PATCH v3 1/5] musl: Update to latest Khem Raj
@ 2023-09-22 21:05 ` Khem Raj
2023-09-22 21:05 ` [PATCH v3 3/5] musl-legacy-error: Add recipe Khem Raj
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2023-09-22 21:05 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Sync with other musl distros
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
v3: Rebased
| 8 ++++++++
1 file changed, 8 insertions(+)
--git a/meta/recipes-core/musl/bsd-headers/sys-cdefs.h b/meta/recipes-core/musl/bsd-headers/sys-cdefs.h
index 209a623c0f0..841a5da8ba4 100644
--- a/meta/recipes-core/musl/bsd-headers/sys-cdefs.h
+++ b/meta/recipes-core/musl/bsd-headers/sys-cdefs.h
@@ -1,3 +1,6 @@
+#ifndef _SYS_CDEFS_H_
+#define _SYS_CDEFS_H_
+
#warning usage of non-standard #include <sys/cdefs.h> is deprecated
#undef __P
@@ -24,3 +27,8 @@
# define __THROW
# define __NTH(fct) fct
#endif
+
+#define __CONCAT(x,y) x ## y
+#define __STRING(x) #x
+
+#endif /* _SYS_CDEFS_H_ */
--
2.42.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v3 3/5] musl-legacy-error: Add recipe
2023-09-22 21:05 [PATCH v3 1/5] musl: Update to latest Khem Raj
2023-09-22 21:05 ` [PATCH v3 2/5] bsd-headers: Define __CONCAT and __STRING Khem Raj
@ 2023-09-22 21:05 ` Khem Raj
2023-09-22 21:05 ` [PATCH 4/5] elfutils: Depend on musl-legacy-error for musl targets Khem Raj
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2023-09-22 21:05 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
This adds glibc error() API implementation which is needed by few
packages still.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
v3: Added new
meta/conf/distro/include/maintainers.inc | 1 +
meta/recipes-core/musl/musl-legacy-error.bb | 26 ++++++++
.../musl/musl-legacy-error/error.h | 60 +++++++++++++++++++
3 files changed, 87 insertions(+)
create mode 100644 meta/recipes-core/musl/musl-legacy-error.bb
create mode 100644 meta/recipes-core/musl/musl-legacy-error/error.h
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index e977c84fc82..f69f229fc85 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -531,6 +531,7 @@ RECIPE_MAINTAINER:pn-mtd-utils = "Denys Dmytriyenko <denis@denix.org>"
RECIPE_MAINTAINER:pn-mtdev = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER:pn-mtools = "Anuj Mittal <anuj.mittal@intel.com>"
RECIPE_MAINTAINER:pn-musl = "Khem Raj <raj.khem@gmail.com>"
+RECIPE_MAINTAINER:pn-musl-legacy-error = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER:pn-musl-locales = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER:pn-musl-obstack = "Khem Raj <raj.khem@gmail.com>"
RECIPE_MAINTAINER:pn-musl-utils = "Khem Raj <raj.khem@gmail.com>"
diff --git a/meta/recipes-core/musl/musl-legacy-error.bb b/meta/recipes-core/musl/musl-legacy-error.bb
new file mode 100644
index 00000000000..5ce5a233ab1
--- /dev/null
+++ b/meta/recipes-core/musl/musl-legacy-error.bb
@@ -0,0 +1,26 @@
+# Copyright (C) 2023 Khem Raj <raj.khem@gmail.com>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+SUMMARY = "error API GNU extention implementation"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://error.h;beginline=1;md5=2ee396b23e8507fbf8f98af0471a77c6"
+SECTION = "devel"
+
+SRC_URI = "file://error.h"
+
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+
+INHIBIT_DEFAULT_DEPS = "1"
+
+S = "${WORKDIR}"
+
+do_install() {
+ install -Dm 0644 ${S}/error.h -t ${D}${includedir}
+}
+#
+# We will skip parsing for non-musl systems
+#
+COMPATIBLE_HOST = ".*-musl.*"
+DEV_PKG_DEPENDENCY = ""
+RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
diff --git a/meta/recipes-core/musl/musl-legacy-error/error.h b/meta/recipes-core/musl/musl-legacy-error/error.h
new file mode 100644
index 00000000000..9a4e1f8d006
--- /dev/null
+++ b/meta/recipes-core/musl/musl-legacy-error/error.h
@@ -0,0 +1,60 @@
+#ifndef _ERROR_H_
+#define _ERROR_H_
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#warning usage of non-standard #include <error.h> is deprecated
+
+static unsigned int error_message_count = 0;
+
+static inline void error(int status, int errnum, const char* format, ...)
+{
+ /* should be fflush(stdout), but that's unspecified if stdout has been closed;
+ * stick with fflush(NULL) for simplicity (glibc checks if the fd is still valid) */
+ fflush(NULL);
+
+ va_list ap;
+ fprintf(stderr, "%s: ", program_invocation_name);
+ va_start(ap, format);
+ vfprintf(stderr, format, ap);
+ va_end(ap);
+ if (errnum)
+ fprintf(stderr, ": %s", strerror(errnum));
+ fprintf(stderr, "\n");
+ error_message_count++;
+ if (status)
+ exit(status);
+}
+
+static int error_one_per_line = 0;
+
+static inline void error_at_line(int status, int errnum, const char *filename,
+ unsigned int linenum, const char *format, ...)
+{
+ va_list ap;
+ if (error_one_per_line) {
+ static const char *old_filename;
+ static int old_linenum;
+ if (linenum == old_linenum && filename == old_filename)
+ return;
+ old_filename = filename;
+ old_linenum = linenum;
+ }
+ fprintf(stderr, "%s: %s:%u: ", program_invocation_name, filename, linenum);
+ va_start(ap, format);
+ vfprintf(stderr, format, ap);
+ va_end(ap);
+ if (errnum)
+ fprintf(stderr, ": %s", strerror(errnum));
+ fprintf(stderr, "\n");
+ error_message_count++;
+ if (status)
+ exit(status);
+}
+
+
+#endif /* _ERROR_H_ */
--
2.42.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/5] elfutils: Depend on musl-legacy-error for musl targets
2023-09-22 21:05 [PATCH v3 1/5] musl: Update to latest Khem Raj
2023-09-22 21:05 ` [PATCH v3 2/5] bsd-headers: Define __CONCAT and __STRING Khem Raj
2023-09-22 21:05 ` [PATCH v3 3/5] musl-legacy-error: Add recipe Khem Raj
@ 2023-09-22 21:05 ` Khem Raj
2023-09-22 21:05 ` [PATCH 5/5] debugedit: Use musl-legacy-error Khem Raj
2023-09-25 16:04 ` [OE-core] [PATCH v3 1/5] musl: Update to latest Alexandre Belloni
4 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2023-09-22 21:05 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
this ensures a gnu compatible error APIs are made available, the patch
to workaround this is no longer needed.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
v3: Added
.../elfutils/elfutils_0.189.bb | 3 +-
.../0015-config-eu.am-do-not-use-Werror.patch | 37 -------------------
2 files changed, 1 insertion(+), 39 deletions(-)
delete mode 100644 meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.189.bb b/meta/recipes-devtools/elfutils/elfutils_0.189.bb
index d6352de5cf5..d8bf82b0229 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.189.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.189.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://debuginfod/debuginfod-client.c;endline=28;md5=f0a7c3170776866ee94e8f9225a6ad79 \
"
DEPENDS = "zlib virtual/libintl"
-DEPENDS:append:libc-musl = " argp-standalone fts musl-obstack "
+DEPENDS:append:libc-musl = " argp-standalone fts musl-legacy-error musl-obstack"
# The Debian patches below are from:
# http://ftp.de.debian.org/debian/pool/main/e/elfutils/elfutils_0.176-1.debian.tar.xz
SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
@@ -24,7 +24,6 @@ SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2 \
"
SRC_URI:append:libc-musl = " \
file://0003-musl-utils.patch \
- file://0015-config-eu.am-do-not-use-Werror.patch \
"
SRC_URI[sha256sum] = "39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8"
diff --git a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch b/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
deleted file mode 100644
index 9ee5801c561..00000000000
--- a/meta/recipes-devtools/elfutils/files/0015-config-eu.am-do-not-use-Werror.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c209233857a73970d7a7dd8da664903570efc7ea Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Mon, 22 Jun 2020 21:35:16 +0000
-Subject: [PATCH] config/eu.am: do not use -Werror
-
-Due to re-definition of error() on musl, gcc starts throwing
-errors where none happen with glibc. Since upstream is not
-likely to be interested in musl builds, lets just disable
-Werror.
-
-Upstream-Status: Inappropriate [oe core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
----
- config/eu.am | 2 --
- 1 file changed, 2 deletions(-)
-diff --git a/config/eu.am b/config/eu.am
-index e6c241f..4136e7c 100644
---- a/config/eu.am
-+++ b/config/eu.am
-@@ -99,7 +99,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -Wformat=2 \
- $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
- $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
- $(USE_AFTER_FREE3_WARNING) \
-- $(if $($(*F)_no_Werror),,-Werror) \
- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
- $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
- $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
-@@ -109,7 +108,6 @@ AM_CXXFLAGS = -std=c++11 -Wall -Wshadow \
- $(TRAMPOLINES_WARNING) \
- $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \
- $(NULL_DEREFERENCE_WARNING) $(IMPLICIT_FALLTHROUGH_WARNING) \
-- $(if $($(*F)_no_Werror),,-Werror) \
- $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \
- $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \
- $(if $($(*F)_no_Wpacked_not_aligned),$(NO_PACKED_NOT_ALIGNED_WARNING),) \
---
--
2.42.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 5/5] debugedit: Use musl-legacy-error
2023-09-22 21:05 [PATCH v3 1/5] musl: Update to latest Khem Raj
` (2 preceding siblings ...)
2023-09-22 21:05 ` [PATCH 4/5] elfutils: Depend on musl-legacy-error for musl targets Khem Raj
@ 2023-09-22 21:05 ` Khem Raj
2023-09-25 16:04 ` [OE-core] [PATCH v3 1/5] musl: Update to latest Alexandre Belloni
4 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2023-09-22 21:05 UTC (permalink / raw)
To: openembedded-core; +Cc: Khem Raj
Use error.h to provide GNU extentions for error API
Drop the patch trying to do something about it
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
v3: Added
.../debugedit/debugedit_5.0.bb | 4 +-
...tools-Add-error.h-for-non-glibc-case.patch | 102 ------------------
2 files changed, 2 insertions(+), 104 deletions(-)
delete mode 100644 meta/recipes-devtools/debugedit/files/0001-tools-Add-error.h-for-non-glibc-case.patch
diff --git a/meta/recipes-devtools/debugedit/debugedit_5.0.bb b/meta/recipes-devtools/debugedit/debugedit_5.0.bb
index 257238fa245..63ad7babd9a 100644
--- a/meta/recipes-devtools/debugedit/debugedit_5.0.bb
+++ b/meta/recipes-devtools/debugedit/debugedit_5.0.bb
@@ -11,8 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
SRC_URI = "https://sourceware.org/ftp/debugedit/${PV}/debugedit-${PV}.tar.xz"
-SRC_URI:append:libc-musl = " \
- file://0001-tools-Add-error.h-for-non-glibc-case.patch \
+SRC_URI:append:libc-musl = "\
file://0002-sepdebugcrcfix.c-do-not-use-64bit-variants.patch \
file://0003-Makefile.am-do-not-update-manual.patch \
"
@@ -20,6 +19,7 @@ SRC_URI:append:libc-musl = " \
SRC_URI[sha256sum] = "e9ecd7d350bebae1f178ce6776ca19a648b6fe8fa22f5b3044b38d7899aa553e"
DEPENDS = "elfutils"
+DEPENDS:append:libc-musl = " musl-legacy-error"
inherit pkgconfig autotools
diff --git a/meta/recipes-devtools/debugedit/files/0001-tools-Add-error.h-for-non-glibc-case.patch b/meta/recipes-devtools/debugedit/files/0001-tools-Add-error.h-for-non-glibc-case.patch
deleted file mode 100644
index f6d64cb4e7d..00000000000
--- a/meta/recipes-devtools/debugedit/files/0001-tools-Add-error.h-for-non-glibc-case.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 4c797d3b559ba51bd9ccd9a2036245819acce843 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Thu, 23 Mar 2023 10:54:21 +0800
-Subject: [PATCH] tools: Add error.h for non-glibc case
-
-error is glibc specific API, so this patch will mostly not accepted
-upstream given that elfutils has been closely tied to glibc
-
-This is a OE specific workaround for musl.
-
-Upstream-Status: Inappropriate [OE Specific]
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- tools/debugedit.c | 7 ++++++-
- tools/error.h | 27 +++++++++++++++++++++++++++
- tools/sepdebugcrcfix.c | 7 ++++++-
- 3 files changed, 39 insertions(+), 2 deletions(-)
- create mode 100644 tools/error.h
-
-diff --git a/tools/debugedit.c b/tools/debugedit.c
-index 668777a..a72c3c0 100644
---- a/tools/debugedit.c
-+++ b/tools/debugedit.c
-@@ -25,7 +25,6 @@
- #include <byteswap.h>
- #include <endian.h>
- #include <errno.h>
--#include <error.h>
- #include <limits.h>
- #include <string.h>
- #include <stdlib.h>
-@@ -40,6 +39,12 @@
- #include <gelf.h>
- #include <dwarf.h>
-
-+#ifdef __GLIBC__
-+#include <error.h>
-+#else
-+#include "error.h"
-+#endif
-+
- #ifndef MAX
- #define MAX(m, n) ((m) < (n) ? (n) : (m))
- #endif
-diff --git a/tools/error.h b/tools/error.h
-new file mode 100644
-index 0000000..9b24418
---- /dev/null
-+++ b/tools/error.h
-@@ -0,0 +1,27 @@
-+#ifndef _ERROR_H_
-+#define _ERROR_H_
-+
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <errno.h>
-+
-+static unsigned int error_message_count = 0;
-+
-+static inline void error(int status, int errnum, const char* format, ...)
-+{
-+ va_list ap;
-+ fprintf(stderr, "%s: ", program_invocation_name);
-+ va_start(ap, format);
-+ vfprintf(stderr, format, ap);
-+ va_end(ap);
-+ if (errnum)
-+ fprintf(stderr, ": %s", strerror(errnum));
-+ fprintf(stderr, "\n");
-+ error_message_count++;
-+ if (status)
-+ exit(status);
-+}
-+
-+#endif /* _ERROR_H_ */
-diff --git a/tools/sepdebugcrcfix.c b/tools/sepdebugcrcfix.c
-index da50e6c..c4a9d56 100644
---- a/tools/sepdebugcrcfix.c
-+++ b/tools/sepdebugcrcfix.c
-@@ -29,10 +29,15 @@
- #include <endian.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <error.h>
- #include <libelf.h>
- #include <gelf.h>
-
-+#ifdef __GLIBC__
-+#include <error.h>
-+#else
-+#include "error.h"
-+#endif
-+
- #ifndef _
- #define _(x) x
- #endif
---
-2.17.1
-
--
2.42.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [OE-core] [PATCH v3 1/5] musl: Update to latest
2023-09-22 21:05 [PATCH v3 1/5] musl: Update to latest Khem Raj
` (3 preceding siblings ...)
2023-09-22 21:05 ` [PATCH 5/5] debugedit: Use musl-legacy-error Khem Raj
@ 2023-09-25 16:04 ` Alexandre Belloni
2023-09-25 17:26 ` Khem Raj
4 siblings, 1 reply; 7+ messages in thread
From: Alexandre Belloni @ 2023-09-25 16:04 UTC (permalink / raw)
To: Khem Raj; +Cc: openembedded-core
Hello,
I had this with the series:
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/7848/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/7876/steps/12/logs/stdio
make[2]: Entering directory '/home/root/buildtest/cpio-2.13/rmt'
CC rmt.o
CCLD rmt
/usr/lib/gcc/i686-poky-linux-musl/13.2.0/../../../../i686-poky-linux-musl/bin/ld: rmt.o: in function `parse_opt':
/home/root/buildtest/cpio-2.13/rmt/rmt.c:715:(.text+0x190): undefined reference to `error'
/usr/lib/gcc/i686-poky-linux-musl/13.2.0/../../../../i686-poky-linux-musl/bin/ld: rmt.o: in function `main':
/home/root/buildtest/cpio-2.13/rmt/rmt.c:780:(.text.startup+0x170): undefined reference to `error'
/usr/lib/gcc/i686-poky-linux-musl/13.2.0/../../../../i686-poky-linux-musl/bin/ld: /home/root/buildtest/cpio-2.13/rmt/rmt.c:783:(.text.startup+0x7af): undefined reference to `error'
collect2: error: ld returned 1 exit status
make[2]: Leaving directory '/home/root/buildtest/cpio-2.13/rmt'
make[2]: *** [Makefile:1221: rmt] Error 1
make[1]: *** [Makefile:1282: all-recursive] Error 1
make[1]: Leaving directory '/home/root/buildtest/cpio-2.13'
make: *** [Makefile:1222: all] Error 2
On 22/09/2023 14:05:04-0700, Khem Raj wrote:
> Brings following bug fixes
>
> * 79bdacff glob: fix wrong return code when aborting before any matches
> * 7291c6c6 statvfs: allocate spare for f_type
> * 39e43f08 math: fix ld80 powl(x,huge) and powl(LDBL_MAX,small)
> * 6d101027 math: fix ld80 acoshl(x) for x < 0
>
> Drop MIRRORS and switch to etalabs.net for git fetch URI
> original repo is not working correcting with git Fetcher
>
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> v3: Update SRC_URI to fetchable location
>
> meta/recipes-core/musl/musl_git.bb | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
> index 4a4fe978f93..7dd949ffafd 100644
> --- a/meta/recipes-core/musl/musl_git.bb
> +++ b/meta/recipes-core/musl/musl_git.bb
> @@ -4,21 +4,17 @@
> require musl.inc
> inherit linuxloader
>
> -SRCREV = "83b858f83b658bd34eca5d8ad4d145f673ae7e5e"
> +SRCREV = "79bdacff83a6bd5b70ff5ae5eb8b6de82c2f7c30"
>
> BASEVER = "1.2.4"
>
> PV = "${BASEVER}+git"
>
> -# mirror is at git://github.com/kraj/musl.git
> -
> -SRC_URI = "git://git.musl-libc.org/git/musl.git;branch=master;protocol=https \
> +SRC_URI = "git://git.etalabs.net/git/musl;branch=master;protocol=https \
> file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \
> file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \
> "
>
> -MIRRORS += "git://git.musl-libc.org/git/musl.git git://github.com/kraj/musl.git"
> -
> S = "${WORKDIR}/git"
>
> PROVIDES += "virtual/libc virtual/libiconv virtual/libintl virtual/crypt"
> --
> 2.42.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#188133): https://lists.openembedded.org/g/openembedded-core/message/188133
> Mute This Topic: https://lists.openembedded.org/mt/101529915/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [OE-core] [PATCH v3 1/5] musl: Update to latest
2023-09-25 16:04 ` [OE-core] [PATCH v3 1/5] musl: Update to latest Alexandre Belloni
@ 2023-09-25 17:26 ` Khem Raj
0 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2023-09-25 17:26 UTC (permalink / raw)
To: Alexandre Belloni; +Cc: openembedded-core
On Mon, Sep 25, 2023 at 9:04 AM Alexandre Belloni
<alexandre.belloni@bootlin.com> wrote:
>
> Hello,
>
> I had this with the series:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/7848/steps/12/logs/stdio
> https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/7876/steps/12/logs/stdio
>
> make[2]: Entering directory '/home/root/buildtest/cpio-2.13/rmt'
> CC rmt.o
> CCLD rmt
> /usr/lib/gcc/i686-poky-linux-musl/13.2.0/../../../../i686-poky-linux-musl/bin/ld: rmt.o: in function `parse_opt':
> /home/root/buildtest/cpio-2.13/rmt/rmt.c:715:(.text+0x190): undefined reference to `error'
> /usr/lib/gcc/i686-poky-linux-musl/13.2.0/../../../../i686-poky-linux-musl/bin/ld: rmt.o: in function `main':
> /home/root/buildtest/cpio-2.13/rmt/rmt.c:780:(.text.startup+0x170): undefined reference to `error'
> /usr/lib/gcc/i686-poky-linux-musl/13.2.0/../../../../i686-poky-linux-musl/bin/ld: /home/root/buildtest/cpio-2.13/rmt/rmt.c:783:(.text.startup+0x7af): undefined reference to `error'
> collect2: error: ld returned 1 exit status
> make[2]: Leaving directory '/home/root/buildtest/cpio-2.13/rmt'
> make[2]: *** [Makefile:1221: rmt] Error 1
> make[1]: *** [Makefile:1282: all-recursive] Error 1
> make[1]: Leaving directory '/home/root/buildtest/cpio-2.13'
> make: *** [Makefile:1222: all] Error 2
>
>
Please cherry-pick -
https://patchwork.yoctoproject.org/project/oe-core/patch/20230923073100.851867-1-raj.khem@gmail.com/
on top
>
> On 22/09/2023 14:05:04-0700, Khem Raj wrote:
> > Brings following bug fixes
> >
> > * 79bdacff glob: fix wrong return code when aborting before any matches
> > * 7291c6c6 statvfs: allocate spare for f_type
> > * 39e43f08 math: fix ld80 powl(x,huge) and powl(LDBL_MAX,small)
> > * 6d101027 math: fix ld80 acoshl(x) for x < 0
> >
> > Drop MIRRORS and switch to etalabs.net for git fetch URI
> > original repo is not working correcting with git Fetcher
> >
> > Signed-off-by: Khem Raj <raj.khem@gmail.com>
> > ---
> > v3: Update SRC_URI to fetchable location
> >
> > meta/recipes-core/musl/musl_git.bb | 8 ++------
> > 1 file changed, 2 insertions(+), 6 deletions(-)
> >
> > diff --git a/meta/recipes-core/musl/musl_git.bb b/meta/recipes-core/musl/musl_git.bb
> > index 4a4fe978f93..7dd949ffafd 100644
> > --- a/meta/recipes-core/musl/musl_git.bb
> > +++ b/meta/recipes-core/musl/musl_git.bb
> > @@ -4,21 +4,17 @@
> > require musl.inc
> > inherit linuxloader
> >
> > -SRCREV = "83b858f83b658bd34eca5d8ad4d145f673ae7e5e"
> > +SRCREV = "79bdacff83a6bd5b70ff5ae5eb8b6de82c2f7c30"
> >
> > BASEVER = "1.2.4"
> >
> > PV = "${BASEVER}+git"
> >
> > -# mirror is at git://github.com/kraj/musl.git
> > -
> > -SRC_URI = "git://git.musl-libc.org/git/musl.git;branch=master;protocol=https \
> > +SRC_URI = "git://git.etalabs.net/git/musl;branch=master;protocol=https \
> > file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \
> > file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \
> > "
> >
> > -MIRRORS += "git://git.musl-libc.org/git/musl.git git://github.com/kraj/musl.git"
> > -
> > S = "${WORKDIR}/git"
> >
> > PROVIDES += "virtual/libc virtual/libiconv virtual/libintl virtual/crypt"
> > --
> > 2.42.0
> >
>
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#188133): https://lists.openembedded.org/g/openembedded-core/message/188133
> > Mute This Topic: https://lists.openembedded.org/mt/101529915/3617179
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
^ permalink raw reply [flat|nested] 7+ messages in thread