Skip to contentSkip to conversation

vsftpd_3.0.5.bb: Define _LARGEFILE64_SOURCE on musl

PATCH New Khem Raj 1 participant 2 messages Dec 30, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 vsftpd_3.0.5.bb: Define _LARGEFILE64_SOURCE on musl

Needed for F_SETLKW64

---
 meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.5.bb +1 -1
index cce3e66adc..0ae52c8ddc 100644
@@ -45,7 +45,7 @@ inherit update-rc.d useradd systemd
 
 CONFFILES:${PN} = "${sysconfdir}/vsftpd.conf"
 LDFLAGS:append =" -lcrypt -lcap"
-CFLAGS:append:libc-musl = " -D_GNU_SOURCE -include fcntl.h"
+CFLAGS:append:libc-musl = " -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -include fcntl.h"
 EXTRA_OEMAKE = "-e MAKEFLAGS="
 
 do_configure() {
Signature · 1 line
2.39.0
author
#1 lore raw

PATCH 2/2 mozjs-102: Disable mozilla stackwalk on musl

---
 .../mozjs-102/musl-disable-stackwalk.patch     | 18 ++++++++++++++++++
 .../mozjs/mozjs-102_102.5.0.bb                 |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 meta-oe/recipes-extended/mozjs/mozjs-102/musl-disable-stackwalk.patch
meta-oe/recipes-extended/mozjs/mozjs-102/musl-disable-stackwalk.patch new file +18 -0
new file mode 100644
index 0000000000..a3ba469a41
@@ -0,0 +1,18 @@
+Musl does not have stack unwinder like glibc therefore
+we can not assume that its always available on musl, we
+do need to check for target environment as well which
+could be musl or glibc.
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <[email protected]>
+--- a/mozglue/misc/StackWalk.cpp
++++ b/mozglue/misc/StackWalk.cpp
+@@ -44,7 +44,7 @@ using namespace mozilla;
+ #  define MOZ_STACKWALK_SUPPORTS_MACOSX 0
+ #endif
+ 
+-#if (defined(linux) &&                                            \
++#if (defined(linux) && defined(__GLIBC__) &&                      \
+      ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \
+       defined(HAVE__UNWIND_BACKTRACE)))
+ #  define MOZ_STACKWALK_SUPPORTS_LINUX 1
meta-oe/recipes-extended/mozjs/mozjs-102_102.5.0.bb +1 -0
index a4d88a340a..d38ae10b87 100644
@@ -14,6 +14,7 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire
            file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \
            file://0001-rewrite-cargo-host-linker-in-python3.patch  \
            file://py-3.11.patch \
+           file://musl-disable-stackwalk.patch \
            "
 SRC_URI[sha256sum] = "017dd44b1285913f477074802707a4c76ed1a28270ec5a327bbb76574cc057d8"
 
Signature · 1 line
2.39.0