Upgrade musl to 1.1.24+
cover Upgrade musl to 1.1.24+
Build it out of tree
Enable 64bit time_t on 32bit arches
The following changes since commit 3e108b70176dee3495f3afcea1c0c87cccf2a379:
bitbake: cache: Lower debug level for wold build messages (2020-01-02 16:43:01 +0000)
are available in the Git repository at:
git://git.yoctoproject.org/poky-contrib kraj/misc
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=kraj/misc
Khem Raj (3):
musl: Upgrade beyond 1.24
musl: Build outside of source tree
tclibc-musl: Add -D__USE_TIME_BITS64 to c/c++ flags
meta/conf/distro/include/tclibc-musl.inc | 1 + meta/recipes-core/musl/musl.inc | 4 +- .../0001-riscv-Define-sigcontext-again.patch | 48 ------------------- meta/recipes-core/musl/musl_git.bb | 5 +- 4 files changed, 6 insertions(+), 52 deletions(-) delete mode 100644 meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch
Signature · 1 line
2.24.1
PATCH 1/3 musl: Upgrade beyond 1.24
License-Change: Added ARM to copyright files [1] [2] [3]
Detailed changes are here [4]
[1] https://git.musl-libc.org/cgit/musl/commit/COPYRIGHT?id=db3cc9a319c788cf5241ea68d3fa86b43f35733e
[2] https://git.musl-libc.org/cgit/musl/commit/?id=daa29e894c74d61296fe19d9b7c4be2f04037639
[3] https://git.musl-libc.org/cgit/musl/commit/?id=d3f7df235904439d48db041c7796e5b44be5b8e6
[4] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=2c2477da9a553c0b9b2fa18073a5dcdbe6d395af..70d80609558153a996833392999c69cdb74e1119
--- meta/recipes-core/musl/musl.inc | 2 +- .../0001-riscv-Define-sigcontext-again.patch | 48 ------------------- meta/recipes-core/musl/musl_git.bb | 5 +- 3 files changed, 3 insertions(+), 52 deletions(-) delete mode 100644 meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch
meta/recipes-core/musl/musl.inc +1 -1
@@ -9,7 +9,7 @@ standards-conformance and safety." HOMEPAGE = "http://www.musl-libc.org/" LICENSE = "MIT" SECTION = "libs" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d0fe2be17bc45ff4a42ade1c13ed6340" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f95ee848a08ad253c04723da00cedb01" INHIBIT_DEFAULT_DEPS = "1"
meta/recipes-core/musl/musl/0001-riscv-Define-sigcontext-again.patch deleted +0 -48
48 lines not on this page · raw message
meta/recipes-core/musl/musl_git.bb +2 -3
@@ -4,9 +4,9 @@ require musl.inc inherit linuxloader -SRCREV = "2c2477da9a553c0b9b2fa18073a5dcdbe6d395af" +SRCREV = "70d80609558153a996833392999c69cdb74e1119" -BASEVER = "1.1.23" +BASEVER = "1.1.24" PV = "${BASEVER}+git${SRCPV}"
@@ -15,7 +15,6 @@ PV = "${BASEVER}+git${SRCPV}" SRC_URI = "git://git.musl-libc.org/musl \ file://0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch \ file://0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch \ - file://0001-riscv-Define-sigcontext-again.patch \ " S = "${WORKDIR}/git"
Signature · 1 line
2.24.1
PATCH 2/3 musl: Build outside of source tree
In reply to Khem Rajmusl does not use cmake/autotools etc. but plane old makefile basded build system, which means it does not get B defined to be outside S therefore define B explicitly to be outside S
--- meta/recipes-core/musl/musl.inc | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-core/musl/musl.inc +2 -0
@@ -25,3 +25,5 @@ MIPS_INSTRUCTION_SET = "mips" ARM_INSTRUCTION_SET_armv5 = "arm" ARM_INSTRUCTION_SET_armv4 = "arm" +# Enable out of tree build +B = "${WORKDIR}/build"
Signature · 1 line
2.24.1
Re: [PATCH 2/3] musl: Build outside of source tree
Quoted 14 lines · Khem Raj
musl does not use cmake/autotools etc. but plane old makefile basded build system, which means it does not get B defined to be outside S therefore define B explicitly to be outside S
Signed-off-by Khem Raj <[email protected]>--- meta/recipes-core/musl/musl.inc | 2 ++ 1 file changed, 2 insertions(+)meta/recipes-core/musl/musl.inc +0
-0
meta/recipes-core/musl/musl.inc MIPS_INSTRUCTION_SET = "mips" · line 29
Quoted 5 lines
meta/recipes-core/musl/musl.inc +2
-0@@ -25,3 +25,5 @@ MIPS_INSTRUCTION_SET = "mips" ARM_INSTRUCTION_SET_armv5 = "arm" ARM_INSTRUCTION_SET_armv4 = "arm" +# Enable out of tree build +B = "${WORKDIR}/build"
That directory won't get cleaned unless you also set [cleandirs].
Ross
PATCH 3/3 tclibc-musl: Add -D__USE_TIME_BITS64 to c/c++ flags
In reply to Khem RajThis is needed for 64bit time_t support on 32bit architectures see [1]
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
--- meta/conf/distro/include/tclibc-musl.inc | 1 + 1 file changed, 1 insertion(+)
meta/conf/distro/include/tclibc-musl.inc +1 -0
@@ -18,6 +18,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED += "ldconfig" #USE_NLS ?= "no" CXXFLAGS += "-fvisibility-inlines-hidden" +TARGET_CC_ARCH += "-D__USE_TIME_BITS64" IMAGE_LINGUAS = ""
Signature · 1 line
2.24.1
Re: [PATCH 3/3] tclibc-musl: Add -D__USE_TIME_BITS64 to c/c++ flags
Quoted 4 lines · Khem Raj
This is needed for 64bit
time_tsupport on 32bit architectures see [1][1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
As per the above, __USE_TIME_BITS64 is a glibc-internal macro, to be defined (by glibc), when the application requestion 64 bit time_t via #define _TIME_BITS 64
Is the behaviour different on musl? Should this patch instead set _TIME_BITS?
Cheers,
Andre'
Quoted 21 lines
Signed-off-by Khem Raj <[email protected]>--- meta/conf/distro/include/tclibc-musl.inc | 1 + 1 file changed, 1 insertion(+)meta/conf/distro/include/tclibc-musl.inc +1
-0@@ -18,6 +18,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED += "ldconfig" #USE_NLS ?= "no" CXXFLAGS += "-fvisibility-inlines-hidden" +TARGET_CC_ARCH += "-D__USE_TIME_BITS64" IMAGE_LINGUAS = ""Signature · 1 line
2.24.1
Re: [PATCH 3/3] tclibc-musl: Add -D__USE_TIME_BITS64 to c/c++ flags
Quoted 5 lines · André Draszik
Quoted 3 lines · Khem Raj
This is needed for 64bit
time_tsupport on 32bit architectures see [1]
Quoted 7 lines
Quoted 1 line
[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=152194fe9c3f
As per the above,
__USE_TIME_BITS64is a glibc-internal macro, to be defined (by glibc), when the application requestion 64 bittime_tvia #define_TIME_BITS64Is the behaviour different on musl? Should this patch instead set
_TIME_BITS?
For musl we wont need it since it is now the default.
this has now been defined in musl itself lately [1], so we don't need to add this define externally anymore This was not the case when the patchset was done.
I will test out a patch to remove it with latest musl and see if it all works ok.
[1] https://git.musl-libc.org/cgit/musl/commit/?id=f12bd8e05c8bb2c3e2b91d635887ec424ef8fbd9
Quoted 31 lines
Cheers,
Andre'Quoted 19 lines
Signed-off-by Khem Raj <[email protected]>--- meta/conf/distro/include/tclibc-musl.inc | 1 + 1 file changed, 1 insertion(+)meta/conf/distro/include/tclibc-musl.inc +1
-1@@ -18,6 +18,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED += "ldconfig" #USE_NLS ?= "no" CXXFLAGS += "-fvisibility-inlines-hidden" +TARGET_CC_ARCH += "-D__USE_TIME_BITS64" IMAGE_LINGUAS = "" --Quoted 2 lines
2.24.1
--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core