kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-25 12:36:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Regenerate musl 1.1 using musl-chartable-tools

Browse source
This commit is contained in:
fosslinux 2025-02-03 15:55:04 +11:00
parent bd4051d110
commit 838051151c
5 changed files with 99 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

21
steps/musl-1.1.24/files/cut.patch Normal file
View file

@ -0,0 +1,21 @@
SPDX-FileCopyrightText: 2024 fosslinux <fosslinux@aussies.space>
SPDX-License-Identifier: MIT
(as per https://github.com/richfelker/musl-chartable-tools/issues/3)
For musl-chartable-tools.
For the earliest build where we use this, cut is bugged (always says out of
memory). We replace the cut command with equivalent sed commands.
--- musl-chartable-tools-44d780e03e78efcb3168ceab068170206dc92e85/iconv/Makefile 2024-12-21 12:45:54.752170920 +1100
+++ musl-chartable-tools-44d780e03e78efcb3168ceab068170206dc92e85/iconv/Makefile 2024-12-21 12:49:07.040155495 +1100
@@ -12,7 +12,7 @@
legacychars.h: arrayify $(CHARMAPS)
cat $(CHARMAPS) \
| grep -v '^0x.. 0x00..' | grep ^0x[0123456789ABCDEFabcdef] \
- | cut -d' ' -f2 | tr a-z A-Z | sort -u \
+ | sed 's/[^\t]*\t//' | sed 's/\t.*//' | tr a-z A-Z | sort -u \
| ./arrayify > $@
mkcodepage: mkcodepage.c legacychars.h

53
steps/musl-1.1.24/files/disable_ctype_headers.patch Normal file
View file

@ -0,0 +1,53 @@
SPDX-FileCopyrightText: 2024 fosslinux <fosslinux@aussies.space>
SPDX-License-Identifier: MIT
diff --color -ru include/wchar.h include/wchar.h
--- musl-chartable-tools-44d780e03e78efcb3168ceab068170206dc92e85/include/wchar.h 2024-12-21 11:29:46.207537390 +1100
+++ musl-chartable-tools-44d780e03e78efcb3168ceab068170206dc92e85/include/wchar.h 2024-12-21 12:03:00.494377416 +1100
@@ -175,10 +175,7 @@
#if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || defined(_BSD_SOURCE)
int wcwidth (wchar_t);
int wcswidth (const wchar_t *, size_t);
-int iswalnum(wint_t);
-int iswalpha(wint_t);
int iswblank(wint_t);
-int iswcntrl(wint_t);
int iswdigit(wint_t);
int iswgraph(wint_t);
int iswlower(wint_t);
@@ -187,9 +184,6 @@
int iswspace(wint_t);
int iswupper(wint_t);
int iswxdigit(wint_t);
-int iswctype(wint_t, wctype_t);
-wint_t towlower(wint_t);
-wint_t towupper(wint_t);
wctype_t wctype(const char *);
#ifndef __cplusplus
diff --color -ru include/wctype.h include/wctype.h
--- musl-chartable-tools-44d780e03e78efcb3168ceab068170206dc92e85/include/wctype.h 2024-12-21 11:29:46.207537390 +1100
+++ musl-chartable-tools-44d780e03e78efcb3168ceab068170206dc92e85/include/wctype.h 2024-12-21 12:07:48.030354351 +1100
@@ -24,10 +24,7 @@
#undef iswdigit
-int iswalnum(wint_t);
-int iswalpha(wint_t);
int iswblank(wint_t);
-int iswcntrl(wint_t);
int iswdigit(wint_t);
int iswgraph(wint_t);
int iswlower(wint_t);
@@ -36,10 +33,6 @@
int iswspace(wint_t);
int iswupper(wint_t);
int iswxdigit(wint_t);
-int iswctype(wint_t, wctype_t);
-wint_t towctrans(wint_t, wctrans_t);
-wint_t towlower(wint_t);
-wint_t towupper(wint_t);
wctrans_t wctrans(const char *);
wctype_t wctype(const char *);