ports: Misc package backports

Author: mintsuki

GNUmakefile

@@ -14,7 +14,7 @@ debug:
 
 jinx:
 	git clone https://codeberg.org/mintsuki/jinx.git jinx-repo
-	git -C jinx-repo checkout 7a101a39eb061713f9c50ceafa1d713f35f17a3b
+	git -C jinx-repo checkout 275dd562af97a5c9c4ccc5d0e29611cb14f73231
 	mv jinx-repo/jinx ./
 	rm -rf jinx-repo
 

build-support/cross-llvm-config

@@ -4,18 +4,19 @@ import argparse
 import sys
 import os
 
-our_version = 18
+our_version = 20
 
 
 def do_version():
-    return '{}.1.7'.format(our_version)
+    return '{}.1.3'.format(our_version)
 
 
 def do_components():
-    return 'aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets amdgpu amdgpuasmparser amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgputargetmca amdgpuutils analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard codegen codegentypes core coroutines coverage debuginfobtf debuginfocodeview debuginfodwarf debuginfogsym debuginfologicalview debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker dwarflinkerclassic dwarflinkerparallel dwp engine executionengine extensions filecheck frontenddriver frontendhlsl frontendoffloading frontendopenacc frontendopenmp fuzzercli fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo hipstdpar instcombine instrumentation interfacestub interpreter ipo irprinter irreader jitlink lanai lanaiasmparser lanaicodegen lanaidesc lanaidisassembler lanaiinfo libdriver lineeditor linker loongarch loongarchasmparser loongarchcodegen loongarchdesc loongarchdisassembler loongarchinfo lto mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts objcopy object objectyaml option orcdebugging orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvtargetmca runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target targetparser textapi textapibinaryreader transformutils ve veasmparser vecodegen vectorize vedesc vedisassembler veinfo webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsdriver windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86targetmca xcore xcorecodegen xcoredesc xcoredisassembler xcoreinfo xray'
+    return 'aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets amdgpu amdgpuasmparser amdgpucodegen amdgpudesc amdgpudisassembler amdgpuinfo amdgputargetmca amdgpuutils analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard cgdata codegen codegentypes core coroutines coverage debuginfobtf debuginfocodeview debuginfodwarf debuginfogsym debuginfologicalview debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker dwarflinkerclassic dwarflinkerparallel dwp engine executionengine extensions filecheck frontendatomic frontenddriver frontendhlsl frontendoffloading frontendopenacc frontendopenmp fuzzercli fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo hipstdpar instcombine instrumentation interfacestub interpreter ipo irprinter irreader jitlink lanai lanaiasmparser lanaicodegen lanaidesc lanaidisassembler lanaiinfo libdriver lineeditor linker loongarch loongarchasmparser loongarchcodegen loongarchdesc loongarchdisassembler loongarchinfo lto mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts objcopy object objectyaml option orcdebugging orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvtargetmca runtimedyld sandboxir scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo spirv spirvanalysis spirvcodegen spirvdesc spirvinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target targetparser telemetry textapi textapibinaryreader transformutils ve veasmparser vecodegen vectorize vedesc vedisassembler veinfo webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsdriver windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86targetmca xcore xcorecodegen xcoredesc xcoredisassembler xcoreinfo xray'
+
 
 def do_targets_built():
-    return 'AArch64 AMDGPU ARM AVR BPF Hexagon Lanai LoongArch Mips MSP430 NVPTX PowerPC RISCV Sparc SystemZ VE WebAssembly X86 XCore'
+    return 'AArch64 AMDGPU ARM AVR BPF Hexagon Lanai LoongArch Mips MSP430 NVPTX PowerPC RISCV Sparc SPIRV SystemZ VE WebAssembly X86 XCore'
 
 
 def get_includedir():

build-support/makeiso.sh

@@ -5,6 +5,7 @@ set -ex
 # Build the sysroot with jinx and build limine.
 rm -rf sysroot
 set -f
+./jinx build-if-needed base $PKGS_TO_INSTALL
 ./jinx install "sysroot" base $PKGS_TO_INSTALL
 set +f
 if ! [ -d host-pkgs/limine ]; then

jinx-config

@@ -1,6 +1,6 @@
 #! /bin/sh
 
-JINX_MAJOR_VER=0.4
+JINX_MAJOR_VER=0.5
 
 HOST_CFLAGS="-O2 -pipe -fstack-clash-protection"
 HOST_CXXFLAGS="${HOST_CFLAGS} -Wp,-D_GLIBCXX_ASSERTIONS"
@@ -14,6 +14,8 @@ if [ -z "$ARCHITECTURE" ]; then
     ARCHITECTURE=x86_64
 fi
 
+JINX_ARCH=${ARCHITECTURE}
+
 OS_TRIPLET=$ARCHITECTURE-vinix-mlibc
 
 case "$ARCHITECTURE" in

patches/gcc-host/jinx-working-patch.patch

@@ -12,7 +12,7 @@ index df90720..c7df202 100755
      powerpc-*-eabisim* | \
 diff --git gcc-host-workdir/gcc/config/vinix.h gcc-host-workdir/gcc/config/vinix.h
 new file mode 100644
-index 0000000..c7cdde2
+index 0000000..5420098
 --- /dev/null
 +++ gcc-host-workdir/gcc/config/vinix.h
 @@ -0,0 +1,29 @@
@@ -45,13 +45,26 @@ index 0000000..c7cdde2
 +    builtin_assert ("system=unix");      \
 +    builtin_assert ("system=posix");     \
 +  } while (0);
+diff --git gcc-host-clean/gcc/config.build gcc-host-workdir/gcc/config.build
+index b748b33..afbdde0 100644
+--- gcc-host-clean/gcc/config.build
++++ gcc-host-workdir/gcc/config.build
+@@ -45,7 +45,7 @@
+ build_xm_file=
+ build_xm_defines=
+ build_exeext=
+-build_install_headers_dir=install-headers-tar
++build_install_headers_dir=install-headers-cp
+ build_file_translate=
+ 
+ # System-specific settings.
 diff --git gcc-host-clean/gcc/config.gcc gcc-host-workdir/gcc/config.gcc
-index 648b3dc..a8c6b3d 100644
+index 95c91ee..dd17677 100644
 --- gcc-host-clean/gcc/config.gcc
 +++ gcc-host-workdir/gcc/config.gcc
-@@ -840,6 +840,15 @@ case ${target} in
-   tmake_file="${tmake_file} t-freebsd"
-   target_has_targetdm=yes
+@@ -878,6 +878,15 @@ case ${target} in
+   rust_target_objs="${rust_target_objs} freebsd-rust.o"
+   target_has_targetrustm=yes
    ;;
 +*-*-*-mlibc)
 +  extra_options="$extra_options gnu-user.opt"
@@ -64,8 +77,8 @@ index 648b3dc..a8c6b3d 100644
 +  ;;
  *-*-fuchsia*)
    native_system_header_dir=/include
-   ;;
-@@ -2214,6 +2223,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
+   tmake_file="t-fuchsia"
+@@ -2284,6 +2293,9 @@ i[34567]86-*-mingw* | x86_64-*-mingw*)
  			;;
  	esac
  	;;
@@ -75,11 +88,37 @@ index 648b3dc..a8c6b3d 100644
  x86_64-*-fuchsia*)
  	tmake_file="${tmake_file} i386/t-x86_64-elf"
  	tm_file="${tm_file} i386/unix.h i386/att.h elfos.h newlib-stdint.h i386/i386elf.h i386/x86-64.h fuchsia.h"
+diff --git gcc-host-clean/libcpp/Makefile.in gcc-host-workdir/libcpp/Makefile.in
+index ebbca37..ea97ba4 100644
+--- gcc-host-clean/libcpp/Makefile.in
++++ gcc-host-workdir/libcpp/Makefile.in
+@@ -32,10 +32,10 @@ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+ CATALOGS = $(patsubst %,po/%,@CATALOGS@)
+ CC = @CC@
+-CFLAGS = @CFLAGS@
++override CFLAGS := @CFLAGS@
+ WARN_CFLAGS = @warn@ @c_warn@ @WARN_PEDANTIC@ @WERROR@
+ CXX = @CXX@
+-CXXFLAGS = @CXXFLAGS@
++override CXXFLAGS := @CXXFLAGS@
+ WARN_CXXFLAGS = @warn@ @WARN_PEDANTIC@ @WERROR@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+@@ -45,7 +45,7 @@ INCINTL = @INCINTL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-LDFLAGS = @LDFLAGS@
++override LDFLAGS := @LDFLAGS@
+ LIBICONV = @LIBICONV@
+ LIBINTL = @LIBINTL@
+ PACKAGE = @PACKAGE@
 diff --git gcc-host-clean/libgcc/config.host gcc-host-workdir/libgcc/config.host
-index 9d72120..b2162ac 100644
+index e75a7af..4d61f58 100644
 --- gcc-host-clean/libgcc/config.host
 +++ gcc-host-workdir/libgcc/config.host
-@@ -281,6 +281,11 @@ case ${host} in
+@@ -304,6 +304,11 @@ case ${host} in
    tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip t-slibgcc t-slibgcc-fuchsia"
    extra_parts="crtbegin.o crtend.o"
    ;;
@@ -91,7 +130,7 @@ index 9d72120..b2162ac 100644
  *-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-gnu* | *-*-kopensolaris*-gnu | *-*-uclinuxfdpiceabi)
    tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver t-linux"
    extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
-@@ -715,6 +720,10 @@ x86_64-*-elf* | x86_64-*-rtems*)
+@@ -752,6 +757,10 @@ x86_64-*-elf* | x86_64-*-rtems*)
  x86_64-*-fuchsia*)
  	tmake_file="$tmake_file t-libgcc-pic"
  	;;
@@ -103,7 +142,7 @@ index 9d72120..b2162ac 100644
  	tmake_file="${tmake_file} i386/t-dragonfly i386/t-crtstuff"
  	md_unwind_header=i386/dragonfly-unwind.h
 diff --git gcc-host-clean/libgcc/configure.ac gcc-host-workdir/libgcc/configure.ac
-index 2fc9d5d..83d246e 100644
+index 4e8c036..d298fe5 100644
 --- gcc-host-clean/libgcc/configure.ac
 +++ gcc-host-workdir/libgcc/configure.ac
 @@ -46,7 +46,7 @@ else
@@ -116,7 +155,7 @@ index 2fc9d5d..83d246e 100644
 
  AC_ARG_ENABLE(shared,
 diff --git gcc-host-clean/libiberty/configure.ac gcc-host-workdir/libiberty/configure.ac
-index 28d996f..61ff752 100644
+index 0888e63..10161a1 100644
 --- gcc-host-clean/libiberty/configure.ac
 +++ gcc-host-workdir/libiberty/configure.ac
 @@ -37,7 +37,7 @@ else
@@ -151,29 +190,3 @@ index b3269cb..f2d4d13 100644
    *-fuchsia*)
      SECTION_FLAGS='-ffunction-sections -fdata-sections'
      AC_SUBST(SECTION_FLAGS)
-diff --git gcc-host-clean/libcpp/Makefile.in gcc-host-workdir/libcpp/Makefile.in
-index ebbca37..ea97ba4 100644
---- gcc-clean/libcpp/Makefile.in
-+++ gcc-workdir/libcpp/Makefile.in
-@@ -32,10 +32,10 @@ AUTOCONF = @AUTOCONF@
- AUTOHEADER = @AUTOHEADER@
- CATALOGS = $(patsubst %,po/%,@CATALOGS@)
- CC = @CC@
--CFLAGS = @CFLAGS@
-+override CFLAGS := @CFLAGS@
- WARN_CFLAGS = @warn@ @c_warn@ @WARN_PEDANTIC@ @WERROR@
- CXX = @CXX@
--CXXFLAGS = @CXXFLAGS@
-+override CXXFLAGS := @CXXFLAGS@
- WARN_CXXFLAGS = @warn@ @WARN_PEDANTIC@ @WERROR@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
-@@ -45,7 +45,7 @@ INCINTL = @INCINTL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
--LDFLAGS = @LDFLAGS@
-+override LDFLAGS := @LDFLAGS@
- LIBICONV = @LIBICONV@
- LIBINTL = @LIBINTL@
- PACKAGE = @PACKAGE@

patches/gdbm/jinx-working-patch.patch

@@ -1,5 +1,17 @@
+diff --git gdbm-clean/tools/gdbmapp.h gdbm-workdir/tools/gdbmapp.h
+index 3ea826b..e20253a 100644
+--- gdbm-clean/tools/gdbmapp.h
++++ gdbm-workdir/tools/gdbmapp.h
+@@ -16,6 +16,7 @@
+ 
+ #include <stdlib.h>
+ #include <stdarg.h>
++#include <sys/types.h>
+ #include "gettext.h"
+ #ifdef HAVE_LOCALE_H
+ # include <locale.h>
 diff --git gdbm-clean/tools/var.c gdbm-workdir/tools/var.c
-index ccec5b9..39371d2 100644
+index 2cf922e..6aed417 100644
 --- gdbm-clean/tools/var.c
 +++ gdbm-workdir/tools/var.c
 @@ -14,6 +14,7 @@

patches/gettext/jinx-working-patch.patch

@@ -0,0 +1,39 @@
+diff --git gettext-clean/gettext-runtime/intl/gnulib-lib/getlocalename_l-unsafe.c gettext-workdir/gettext-runtime/intl/gnulib-lib/getlocalename_l-unsafe.c
+index 627434f..9c8e818 100644
+--- gettext-clean/gettext-runtime/intl/gnulib-lib/getlocalename_l-unsafe.c
++++ gettext-workdir/gettext-runtime/intl/gnulib-lib/getlocalename_l-unsafe.c
+@@ -469,6 +469,8 @@ getlocalename_l_unsafe (int category, locale_t locale)
+       struct gl_locale_category_t *plc =
+         &locale->category[gl_log2_lcmask_to_index (gl_log2_lc_mask (category))];
+       return (struct string_with_storage) { plc->name, STORAGE_OBJECT };
++#elif __vinix__
++      return (struct string_with_storage) { "C", STORAGE_INDEFINITE };
+ #elif __GLIBC__ >= 2 && !defined __UCLIBC__
+       /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
+          glibc < 2.12.
+diff --git gettext-clean/gettext-runtime/gnulib-lib/getlocalename_l-unsafe.c gettext-workdir/gettext-runtime/gnulib-lib/getlocalename_l-unsafe.c
+index 627434f..9c8e818 100644
+--- gettext-clean/gettext-runtime/gnulib-lib/getlocalename_l-unsafe.c
++++ gettext-workdir/gettext-runtime/gnulib-lib/getlocalename_l-unsafe.c
+@@ -469,6 +469,8 @@ getlocalename_l_unsafe (int category, locale_t locale)
+       struct gl_locale_category_t *plc =
+         &locale->category[gl_log2_lcmask_to_index (gl_log2_lc_mask (category))];
+       return (struct string_with_storage) { plc->name, STORAGE_OBJECT };
++#elif __vinix__
++      return (struct string_with_storage) { "C", STORAGE_INDEFINITE };
+ #elif __GLIBC__ >= 2 && !defined __UCLIBC__
+       /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
+          glibc < 2.12.
+diff --git gettext-clean/gettext-tools/gnulib-lib/getlocalename_l-unsafe.c gettext-workdir/gettext-tools/gnulib-lib/getlocalename_l-unsafe.c
+index 627434f..9c8e818 100644
+--- gettext-clean/gettext-tools/gnulib-lib/getlocalename_l-unsafe.c
++++ gettext-workdir/gettext-tools/gnulib-lib/getlocalename_l-unsafe.c
+@@ -469,6 +469,8 @@ getlocalename_l_unsafe (int category, locale_t locale)
+       struct gl_locale_category_t *plc =
+         &locale->category[gl_log2_lcmask_to_index (gl_log2_lc_mask (category))];
+       return (struct string_with_storage) { plc->name, STORAGE_OBJECT };
++#elif __vinix__
++      return (struct string_with_storage) { "C", STORAGE_INDEFINITE };
+ #elif __GLIBC__ >= 2 && !defined __UCLIBC__
+       /* Work around an incorrect definition of the _NL_LOCALE_NAME macro in
+          glibc < 2.12.

patches/libxcb/jinx-working-patch.patch

@@ -0,0 +1,15 @@
+diff --git libxcb-clean/doc/Makefile.am libxcb-workdir/doc/Makefile.am
+index f3c934a..08880d7 100644
+--- libxcb-clean/doc/Makefile.am
++++ libxcb-workdir/doc/Makefile.am
+@@ -35,8 +35,8 @@ install-data-local:
+ 	  $(mkinstalldirs) '$(DESTDIR)$(htmldir)'; \
+ 	fi
+ 	@for d in $(docdirs); do \
+-	  echo "cp -pR $$d '$(DESTDIR)$(htmldir)/'"; \
+-	  cp -pR $$d '$(DESTDIR)$(htmldir)/'; \
++	  echo "cp -R $$d '$(DESTDIR)$(htmldir)/'"; \
++	  cp -R $$d '$(DESTDIR)$(htmldir)/'; \
+ 	done
+ 
+ uninstall-local:

patches/libzip/jinx-working-patch.patch

@@ -10,13 +10,6 @@ index ddc2c24..6206bd0 100644
  #ifdef _WIN32
  #include <fcntl.h>
  #include <io.h>
-@@ -742,4 +743,4 @@ static int torrentzip_compare_names(const void *a, const void *b) {
-     }
- 
-     return strcasecmp(aname, bname);
--}
-\ No newline at end of file
-+}
 diff --git libzip-clean/lib/zip_name_locate.c libzip-workdir/lib/zip_name_locate.c
 index 4248dc2..fdf113a 100644
 --- libzip-clean/lib/zip_name_locate.c