Same regeneration for musl 1.2.4

fosslinux · Dec 23, 2024 · 73169a5 · 73169a5
1 parent 5bc79d8
commit 73169a5
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 0 deletions.
diff --git a/steps/musl-1.2.4/pass1.sh b/steps/musl-1.2.4/pass1.sh
@@ -13,6 +13,21 @@ src_get() {
     fi
 }
 
+src_prepare() {
+    default
+
+    # regenerate headers in src/ctype and src/iconv
+    cd ../musl-chartable-tools-78b213a868553b1154ee9627c96ff1f14a9a3b1b
+    cd ctype
+    CC=gcc make
+    cp alpha.h punct.h nonspacing.h wide.h ../../musl-1.2.4/src/ctype/
+    cd ../iconv
+    CC=gcc make
+    cp legacychars.h codepages.h jis0208.h gb18030.h hkscs.h ksc.h revjis.h \
+        ../../musl-1.2.4/src/locale/
+    cd ../../musl-1.2.4
+}
+
 src_configure() {
     CC=gcc ./configure \
         --host=i386-unknown-linux-musl \

diff --git a/steps/musl-1.2.4/pass3.sh b/steps/musl-1.2.4/pass3.sh
@@ -4,6 +4,21 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+src_prepare() {
+    default
+
+    # regenerate headers in src/ctype and src/iconv
+    cd ../musl-chartable-tools-78b213a868553b1154ee9627c96ff1f14a9a3b1b
+    cd ctype
+    CC=gcc make
+    cp alpha.h punct.h nonspacing.h wide.h ../../musl-1.2.4/src/ctype/
+    cd ../iconv
+    CC=gcc make
+    cp legacychars.h codepages.h jis0208.h gb18030.h hkscs.h ksc.h revjis.h \
+        ../../musl-1.2.4/src/locale/
+    cd ../../musl-1.2.4
+}
+
 src_configure() {
     ./configure \
         --host=i386-unknown-linux-musl \

diff --git a/steps/musl-1.2.4/patches-pass2/mkcodepage_return.patch b/steps/musl-1.2.4/patches-pass2/mkcodepage_return.patch
@@ -0,0 +1 @@
+../patches/mkcodepage_return.patch
diff --git a/steps/musl-1.2.4/patches/mkcodepage_return.patch b/steps/musl-1.2.4/patches/mkcodepage_return.patch
@@ -0,0 +1,12 @@
+Inexplicable problem, where mkcodepage returns 3 instead of 0 on some inputs.
+Compilation error?
+
+--- musl-chartable-tools-78b213a868553b1154ee9627c96ff1f14a9a3b1b/iconv/mkcodepage.c	2024-12-21 15:32:02.441185726 +1100
++++ musl-chartable-tools-78b213a868553b1154ee9627c96ff1f14a9a3b1b/iconv/mkcodepage.c	2024-12-21 15:31:52.860186494 +1100
+@@ -63,4 +63,6 @@
+ 		}
+ 	}
+ 	fputs("\"\n\n", f);
++
++	return 0;
+ }
diff --git a/steps/musl-1.2.4/sources b/steps/musl-1.2.4/sources
@@ -1 +1,2 @@
 https://musl.libc.org/releases/musl-1.2.4.tar.gz 7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039
+https://github.com/richfelker/musl-chartable-tools/archive/78b213a868553b1154ee9627c96ff1f14a9a3b1b.tar.gz bb52d7c11b663c2d1c5957fd862758d1da7e65b53c0a8ecfb9110d02c04badb6
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		https://musl.libc.org/releases/musl-1.2.4.tar.gz 7a35eae33d5372a7c0da1188de798726f68825513b7ae3ebe97aaaa52114f039
		https://github.com/richfelker/musl-chartable-tools/archive/78b213a868553b1154ee9627c96ff1f14a9a3b1b.tar.gz bb52d7c11b663c2d1c5957fd862758d1da7e65b53c0a8ecfb9110d02c04badb6