Skip to contentSkip to conversation

musl: Update to tip of master

PATCH New Khem Raj 1 participant 2 messages Jun 26, 2020

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/2 musl: Update to tip of master

Detailed changelog [1]
Refresh patches

[1] https://git.musl-libc.org/cgit/musl/log/?qt=range&q=1b4e84c56df0f8ca30f6bc05962a860f869e71df..fca7428c096066482d8c3f52450810288e27515c

---
 ...ynamic-linker-a-relative-symlink-to-libc.patch | 11 ++---------
 ...libdir-and-libdir-as-default-pathes-to-l.patch | 15 ++++-----------
 meta/recipes-core/musl/musl_git.bb                |  2 +-
 3 files changed, 7 insertions(+), 21 deletions(-)
meta/recipes-core/musl/musl/0001-Make-dynamic-linker-a-relative-symlink-to-libc.patch +2 -9
index 462d338b96..ba00efe7b3 100644
@@ -22,11 +22,9 @@ Upstream-Status: Pending
  tools/install.sh | 8 +++++---
  2 files changed, 6 insertions(+), 4 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index 8246b78..d1dbe39 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -215,7 +215,7 @@ $(DESTDIR)$(includedir)/%: $(srcdir)/include/%
+@@ -210,7 +210,7 @@ $(DESTDIR)$(includedir)/%: $(srcdir)/inc
  	$(INSTALL) -D -m 644 $< $@
  
  $(DESTDIR)$(LDSO_PATHNAME): $(DESTDIR)$(libdir)/libc.so
@@ -35,8 +33,6 @@ index 8246b78..d1dbe39 100644
  
  install-libs: $(ALL_LIBS:lib/%=$(DESTDIR)$(libdir)/%) $(if $(SHARED_LIBS),$(DESTDIR)$(LDSO_PATHNAME),)
  
-diff --git a/tools/install.sh b/tools/install.sh
-index d913b60..b6a7f79 100755
 --- a/tools/install.sh
 +++ b/tools/install.sh
 @@ -6,18 +6,20 @@
@@ -62,7 +58,7 @@ index d913b60..b6a7f79 100755
  m) mode=$OPTARG ;;
  ?) usage ;;
  esac
-@@ -48,7 +50,7 @@ trap 'rm -f "$tmp"' EXIT INT QUIT TERM HUP
+@@ -48,7 +50,7 @@ trap 'rm -f "$tmp"' EXIT INT QUIT TERM H
  umask 077
  
  if test "$symlink" ; then
@@ -71,6 +67,3 @@ index d913b60..b6a7f79 100755
  else
  cat < "$1" > "$tmp"
  chmod "$mode" "$tmp"
--- 
-2.7.4
-
meta/recipes-core/musl/musl/0002-ldso-Use-syslibdir-and-libdir-as-default-pathes-to-l.patch +4 -11
index 6a875a717e..f57aae5f3c 100644
@@ -20,11 +20,9 @@ Signed-off-by: Serhey Popovych <[email protected]>
  ldso/dynlink.c | 4 +++-
  2 files changed, 5 insertions(+), 2 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index b46f8ca4..c07e4ae8 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -46,7 +46,8 @@ CFLAGS_AUTO = -Os -pipe
+@@ -47,7 +47,8 @@ CFLAGS_AUTO = -Os -pipe
  CFLAGS_C99FSE = -std=c99 -ffreestanding -nostdinc 
  
  CFLAGS_ALL = $(CFLAGS_C99FSE)
@@ -34,20 +32,18 @@ index b46f8ca4..c07e4ae8 100644
  CFLAGS_ALL += $(CPPFLAGS) $(CFLAGS_AUTO) $(CFLAGS)
  
  LDFLAGS_ALL = $(LDFLAGS_AUTO) $(LDFLAGS)
-diff --git a/ldso/dynlink.c b/ldso/dynlink.c
-index ec921dfd..7c119c55 100644
 --- a/ldso/dynlink.c
 +++ b/ldso/dynlink.c
-@@ -22,6 +22,8 @@
+@@ -24,6 +24,8 @@
+ #include "libc.h"
  #include "dynlink.h"
- #include "malloc_impl.h"
  
 +#define SYS_PATH_DFLT SYSLIBDIR ":" LIBDIR
 +
  static void error(const char *, ...);
  
  #define MAXP2(a,b) (-(-(a)&-(b)))
-@@ -1038,7 +1040,7 @@ static struct dso *load_library(const char *name, struct dso *needed_by)
+@@ -1071,7 +1073,7 @@ static struct dso *load_library(const ch
  					sys_path = "";
  				}
  			}
@@ -56,6 +52,3 @@ index ec921dfd..7c119c55 100644
  			fd = path_open(name, sys_path, buf, sizeof buf);
  		}
  		pathname = buf;
--- 
-2.7.4
-
meta/recipes-core/musl/musl_git.bb +1 -1
index 6aa69985d7..0913b09aaf 100644
@@ -4,7 +4,7 @@
 require musl.inc
 inherit linuxloader
 
-SRCREV = "1b4e84c56df0f8ca30f6bc05962a860f869e71df"
+SRCREV = "fca7428c096066482d8c3f52450810288e27515c"
 
 BASEVER = "1.2.0"
 
Signature · 1 line
2.27.0
author
#1 lore raw

PATCH 2/2 rxvt-unicode: Disable wtmp on musl

This is not supported features on musl

Fixes
../../rxvt-unicode-9.22/src/../libptytty/src/logging.C:348:17: error: 'WTMPX_FILE' was not declared in this scope; did you mean 'WTMP_FILE'?

|   348 |       updwtmpx (WTMPX_FILE, &utx);
|       |                 ^~~~~~~~~~
---
 meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-sato/rxvt-unicode/rxvt-unicode.inc +2 -0
index b568f04580..b064a63caa 100644
@@ -30,6 +30,8 @@ EXTRA_OECONF = "--enable-xim \
 		--enable-combining --disable-perl \
 		--with-x=${STAGING_DIR_HOST}${prefix}"
 
+EXTRA_OECONF_append_libc-musl = " --disable-wtmp"
+
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[startup] = "--enable-startup-notification,--disable-startup-notification,startup-notification,"
 
Signature · 1 line
2.27.0