Pinetab-v: rope in config

2024-07-11 23:18:40 -04:00
parent 67365bb3dd
commit 2b7a1bd25d
36 changed files with 772 additions and 2 deletions
--- a/machines/ptv/pkgs-cross/argyllcms/default.nix
+++ b/machines/ptv/pkgs-cross/argyllcms/default.nix
@@ -0,0 +1,17 @@
+final: prev: prev.argyllcms.overrideAttrs (old: {
+  postInstall = (prev.lib.optional (prev.stdenv.hostPlatform != prev.stdenv.buildPlatform) ''
+    cp imdi/imdi_make $out/bin
+    cp gamut/GenRMGam $out/bin
+  '');
+  patches = (prev.lib.optionals (prev.stdenv.hostPlatform != prev.stdenv.buildPlatform) [
+    ./imdi_make.patch
+  ]);
+  preBuild = (prev.lib.optional (prev.stdenv.hostPlatform != prev.stdenv.buildPlatform) ''
+    cd imdi; imdi_make; cd ..
+    cd gamut; GenRMGam; cd ..
+  '');
+  # Need to use build version of imdi_make && host version for output
+  depsBuildBuild = (prev.lib.optionals (prev.stdenv.hostPlatform != prev.stdenv.buildPlatform) [
+    prev.buildPackages.argyllcms
+  ]);
+})
--- a/machines/ptv/pkgs-cross/argyllcms/imdi_make.patch
+++ b/machines/ptv/pkgs-cross/argyllcms/imdi_make.patch
@@ -0,0 +1,39 @@
+diff --git a/gamut/Jamfile b/gamut/Jamfile
+index e97d0df..adc259f 100755
+--- a/gamut/Jamfile
+++ b/gamut/Jamfile
+@@ -47,7 +47,7 @@ Main GenRMGam : GenRMGam.c ;
+ # Generate referenec medium gamut the kernel files
+ # (NoUpdate so that Cross Compile Win64 hack works)
+ NNoUpdate RefMediumGamut.gam ;
+-GenFile RefMediumGamut.gam : GenRMGam ;
+# GenFile RefMediumGamut.gam : GenRMGam ;
+ 
+ # Visual gamut
+ Main GenVisGam : GenVisGam.c ;
+diff --git a/imdi/Jamfile b/imdi/Jamfile
+index 79b27fb..64c3348 100755
+--- a/imdi/Jamfile
+++ b/imdi/Jamfile
+@@ -41,7 +41,7 @@ LINKLIBS = ../numlib/libnum ;
+ 
+ # GenFile source.c : program args ;	make custom file
+ # Generate all the kernel files
+-GenFileND imdi_k.h : imdi_make $(IMDI_MAKE_OPT) -d [ NormPaths $(DOT) ] ;
+# GenFileND imdi_k.h : imdi_make $(IMDI_MAKE_OPT) -d [ NormPaths $(DOT) ] ;
+ 
+ # imdi library
+ Library libimdi : imdi.c imdi_tab.c ;
+diff --git a/imdi/Makefile b/imdi/Makefile
+index 5523893..2048875 100755
+--- a/imdi/Makefile
+++ b/imdi/Makefile
+@@ -48,7 +48,7 @@ imdi_gen$(SUFOBJ): imdi_gen.c imdi_utl.h imdi_arch.h imdi_gen.h
+ 
+ # Generate the kernel files
+ imdi_k.h imdi_k.c : imdi_make$(SUFEXE)
+-	.$(SLASH)imdi_make$(SUFEXE) 
+	imdi_make$(SUFEXE)
+ 
+ 
+ # imdi runtime library
--- a/machines/ptv/pkgs-cross/bundlerApp/default.nix
+++ b/machines/ptv/pkgs-cross/bundlerApp/default.nix
@@ -0,0 +1,4 @@
+final: prev: prev.bundlerApp.override (old: {
+  ruby = final.buildPackages.ruby;
+  callPackage = final.newScope { ruby = final.buildPackages.ruby; };
+})
--- a/machines/ptv/pkgs-cross/cryptsetup/default.nix
+++ b/machines/ptv/pkgs-cross/cryptsetup/default.nix
@@ -0,0 +1,3 @@
+final: prev: prev.cryptsetup.overrideAttrs (old: {
+  doCheck = false;
+})
--- a/machines/ptv/pkgs-cross/default.nix
+++ b/machines/ptv/pkgs-cross/default.nix
@@ -0,0 +1,19 @@
+(final: prev: {
+  discount = (import ./discount) final prev;
+  fwupd-efi = (import ./fwupd-efi) final prev;
+  live555 = (import ./live555) final prev;
+  protobuf = (import ./protobuf) final prev;
+  bundlerApp = (import ./bundlerApp) final prev;
+  vulkan-tools = (import ./vulkan-tools) final prev;
+  libdrm = (import ./libdrm) final prev;
+  valgrind = (import ./valgrind) final prev;
+  valgrind-light = final.valgrind.override { gdb = null; };
+  argyllcms = (import ./argyllcms) final prev;
+  gn = (import ./gn) final prev;
+  openfortivpn = (import ./openfortivpn) final prev;
+  vpnc = (import ./vpnc) final prev;
+  # perl538Packages.Testutf8 = (import ./perlTestutf8) final prev;
+  diffutils = (import ./diffutils) final prev;
+  gnugrep = (import ./gnugrep) final prev;
+  cryptsetup = (import ./cryptsetup) final prev;
+})
--- a/machines/ptv/pkgs-cross/diffutils/default.nix
+++ b/machines/ptv/pkgs-cross/diffutils/default.nix
@@ -0,0 +1,4 @@
+
+final: prev: prev.diffutils.overrideAttrs (old: {
+  doCheck = false; #prev.stdenv.hostPlatform != "riscv64-linux";
+})
--- a/machines/ptv/pkgs-cross/discount/config-sed.c
+++ b/machines/ptv/pkgs-cross/discount/config-sed.c
@@ -0,0 +1,23 @@
+#include <stdio.h>
+
+int
+main(argc, argv)
+int argc;
+char **argv;
+{
+    char *p;
+
+    if (argc != 3)
+        return 1;
+
+    printf("s;@%s@;", argv[1]);
+
+    for (p=argv[2]; *p; ++p) {
+        if ( *p == ';' )
+            putchar('\\');
+        putchar(*p);
+    }
+
+    puts(";g");
+    return 0;
+}
--- a/machines/ptv/pkgs-cross/discount/config-sed.patch
+++ b/machines/ptv/pkgs-cross/discount/config-sed.patch
@@ -0,0 +1,67 @@
+diff --git a/configure.inc b/configure.inc
+index fd0c9ba..98066d5 100755
+--- a/configure.inc
+++ b/configure.inc
+@@ -1733,52 +1733,6 @@ AC_FAIL() {
+     $__fail 1
+ }
+ 
+-#
+-# __ac_config_sed; a C program to do escaping for AC_SUB
+-__ac_config_sed() {
+-
+-
+-    test -x config.sed && return
+-
+-    echo "generating config.sed"
+-
+-    AC_PROG_CC
+-    
+-cat > ngc$$.c << \EOF
+-#include <stdio.h>
+-
+-int
+-main(argc, argv)
+-int argc;
+-char **argv;
+-{
+-    char *p;
+-    
+-    if (argc != 3)
+-	return 1;
+-
+-    printf("s;@%s@;", argv[1]);
+-
+-    for (p=argv[2]; *p; ++p) {
+-	if ( *p == ';' )
+-	    putchar('\\');
+-	putchar(*p);
+-    }
+-
+-    puts(";g");
+-    return 0;
+-}
+-EOF
+-
+-    if $AC_CC -o config.sed ngc$$.c; then
+-	rm -f ngc$$.c
+-	__config_files="$__config_files config.sed"
+-    else
+-	rm -f ngc$$.c
+-	AC_FAIL "Cannot generate config.sed helper program"
+-    fi
+-}
+-
+ #
+ # AC_SUB writes a substitution into config.sub
+ AC_SUB() {
+@@ -1788,8 +1742,7 @@ AC_SUB() {
+ 
+     echo "target=$_target, rest=$*"
+     
+-    __ac_config_sed
+-    ./config.sed "$_target" "$*" >> "$__cwd"/config.sub
+    config.sed "$_target" "$*" >> "$__cwd"/config.sub
+ }
+ #
+ # AC_TEXT writes arbitrary text into config.h
--- a/machines/ptv/pkgs-cross/discount/default.nix
+++ b/machines/ptv/pkgs-cross/discount/default.nix
@@ -0,0 +1,47 @@
+final: prev: let
+  config-sed = prev.buildPackages.stdenv.mkDerivation {
+    name = "orc-discount-config-sed";
+    src = ./config-sed.c;
+    dontUnpack = true;
+    buildPhase = ''
+      $CC -o config.sed $src
+    '';
+    installPhase = ''
+      mkdir -p $out/bin
+      chmod +x ./config.sed
+      mv config.sed $out/bin
+    '';
+  };
+in prev.discount.overrideAttrs (old: let
+  patches = [
+    ./config-sed.patch
+    ./make-fix.patch
+  ] ++ old.patches;
+  orc-tools = prev.buildPackages.stdenv.mkDerivation {
+    name = "orc-discount-tools";
+    src = old.src;
+    inherit patches;
+    configureScript = old.configureScript;
+    configureFlags = old.configureFlags;
+    buildPhase = ''
+      $CC -o mktags mktags.c
+      $CC -I ./ -o branch tools/branch.c
+    '';
+    installPhase = ''
+      mkdir -p $out/bin
+      mv mktags $out/bin
+      mv branch $out/bin
+    '';
+  };
+in {
+  # ./configure does not support autoconf-style --build=/--host=.
+  configurePlatforms = [ ];
+  depsBuildBuild = [
+    config-sed
+    orc-tools
+    prev.buildPackages.coreutils
+  ];
+  nativeBuildInputs = [
+  ];
+  inherit patches;
+})
--- a/machines/ptv/pkgs-cross/discount/make-fix.patch
+++ b/machines/ptv/pkgs-cross/discount/make-fix.patch
@@ -0,0 +1,58 @@
+diff --git a/Makefile.in b/Makefile.in
+index 085fbd5..e59d769 100644
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -29,7 +29,7 @@ OBJS=mkdio.o markdown.o dumptree.o generate.o \
+      xml.o Csio.o xmlpage.o basename.o emmatch.o \
+      github_flavoured.o setup.o tags.o html5.o \
+      @AMALLOC@ @H1TITLE@ flags.o
+-TESTFRAMEWORK=echo cols branch pandoc_headers
+TESTFRAMEWORK=echo cols pandoc_headers
+ 
+ # modules that markdown, makepage, mkd2html, &tc use
+ COMMON=pgm_options.o gethopt.o notspecial.o
+@@ -84,19 +84,16 @@ $(DESTDIR)$(LIBDIR):
+ @MK_PKGCONFIG@$(DESTDIR)$(PKGDIR):
+ @MK_PKGCONFIG@	$(INSTALL_DIR) $(DESTDIR)$(PKGDIR)
+ 
+-version.o: version.c VERSION branch
+-	$(BUILD) -DBRANCH=`./branch` -DVERSION=\"`cat VERSION`\" -c version.c
+version.o: version.c VERSION
+	$(BUILD) -DBRANCH=`branch` -DVERSION=\"`cat VERSION`\" -c version.c
+ 
+ VERSION:
+ 	@true
+ 
+ tags.o: tags.c cstring.h tags.h blocktags
+ 
+-blocktags: mktags
+-	./mktags > blocktags
+-
+-mktags: mktags.o
+-	$(LINK) -o mktags mktags.o
+blocktags:
+	mktags > blocktags
+ 
+ # example programs
+ @THEME@theme:  theme.o $(COMMON) $(MKDLIB) mkdio.h
+@@ -143,11 +140,6 @@ pandoc_headers.o: tools/pandoc_headers.c config.h
+ pandoc_headers: pandoc_headers.o $(COMMON) $(MKDLIB)
+ 	$(LINK) -o pandoc_headers pandoc_headers.o $(COMMON) -lmarkdown 
+ 
+-branch.o: tools/branch.c config.h
+-	$(BUILD) -c -o branch.o tools/branch.c
+-branch: branch.o
+-	$(LINK) -o branch branch.o
+-
+ cols.o:	tools/cols.c config.h
+ 	$(BUILD) -c -o cols.o tools/cols.c
+ cols:   cols.o
+@@ -163,7 +155,7 @@ clean:
+ 	rm -f $(MKDLIB) `./librarian.sh files $(MKDLIB) VERSION`
+ 
+ distclean spotless: clean
+-	@DISTCLEAN@ @GENERATED_FILES@ @CONFIGURE_FILES@ ./mktags ./blocktags
+	@DISTCLEAN@ @GENERATED_FILES@ @CONFIGURE_FILES@ ./blocktags
+ 
+ Csio.o: Csio.c cstring.h amalloc.h config.h markdown.h
+ amalloc.o: amalloc.c
--- a/machines/ptv/pkgs-cross/discount/where-tr.patch
+++ b/machines/ptv/pkgs-cross/discount/where-tr.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.inc b/configure.inc
+index fd0c9ba..7ea98e6 100755
+--- a/configure.inc
+++ b/configure.inc
+@@ -1830,7 +1830,7 @@ AC_QUIET() {
+ }
+     
+ 
+-AC_TR=`acLookFor tr`
+AC_TR=`which tr`
+ if [ "$AC_TR" ]; then
+     # try posix-style tr
+     ABC=`echo abc | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`
--- a/machines/ptv/pkgs-cross/fwupd-efi/default.nix
+++ b/machines/ptv/pkgs-cross/fwupd-efi/default.nix
@@ -0,0 +1,19 @@
+(final: prev:
+  prev.fwupd-efi.overrideAttrs (old: {
+    mesonFlags = old.mesonFlags ++ [
+       # Use this instead of patch, however it points to proper binary
+      "-Defi-cc=${prev.stdenv.cc.targetPrefix}cc"
+    ];
+    preBuild = ''
+      cp ${prev.gnu-efi}/lib/*.lds ../efi/lds
+    '';
+    patches = [
+      (prev.fetchurl {
+        url = "https://github.com/fwupd/fwupd-efi/commit/986a6e3beee6b951ca3622f47ed991e0e11c065c.diff";
+        hash = "sha256-UKerVzSn28QSoca6m2igVM6ai8i3B2jyB52B6e/HV5A=";
+      })
+      # ./efi-meson.patch
+    ];
+  })
+)
+  
--- a/machines/ptv/pkgs-cross/fwupd-efi/efi-meson.patch
+++ b/machines/ptv/pkgs-cross/fwupd-efi/efi-meson.patch
@@ -0,0 +1,13 @@
+diff --git a/efi/meson.build b/efi/meson.build
+index 936ba3c..53687b1 100644
+--- a/efi/meson.build
+++ b/efi/meson.build
+@@ -1,7 +1,7 @@
+ generate_sbat = find_program('generate_sbat.py', native: true)
+ generate_binary = find_program('generate_binary.py', native: true)
+ 
+-efi_cc = get_option('efi-cc')
+efi_cc = run_command('sh', '-c', 'echo $CC')
+ efi_ld = get_option('efi-ld')
+ efi_ldsdir = get_option('efi-ldsdir')
+ efi_incdir = get_option('efi-includedir')
--- a/machines/ptv/pkgs-cross/fwupd-efi/meson-rv64.patch
+++ b/machines/ptv/pkgs-cross/fwupd-efi/meson-rv64.patch
@@ -0,0 +1,14 @@
+diff --git a/meson.build b/meson.build
+index 7d59695..b82bcdf 100644
+--- a/meson.build
+++ b/meson.build
+@@ -31,6 +31,9 @@ elif host_cpu == 'arm'
+ elif host_cpu == 'aarch64'
+         EFI_MACHINE_TYPE_NAME = 'aa64'
+         gnu_efi_arch = 'aarch64'
+elif host_cpu == 'riscv64'
+        EFI_MACHINE_TYPE_NAME = '.'
+        gnu_efi_arch = 'riscv64'
+ else
+         error('Unknown host_cpu ' + host_cpu)
+ endif
--- a/machines/ptv/pkgs-cross/gn/default.nix
+++ b/machines/ptv/pkgs-cross/gn/default.nix
@@ -0,0 +1,10 @@
+# TODO: gn-unstable needs rev newer than 2021-01-28
+# 713a1850957b919c876c924e43ef0ddc4d8a8144 for riscv64 support
+
+final: prev: prev.gn.overrideAttrs (old: {
+  src = prev.fetchgit {
+    url = "https://gn.googlesource.com/gn";
+    rev = "713a1850957b919c876c924e43ef0ddc4d8a8144";
+    hash = "sha256-yzx7wPp/PEwGg4HZ99YntyHJ384nTVq6fyB6/vOOvOM=";
+  };
+})
--- a/machines/ptv/pkgs-cross/gnugrep/default.nix
+++ b/machines/ptv/pkgs-cross/gnugrep/default.nix
@@ -0,0 +1,4 @@
+
+final: prev: prev.gnugrep.overrideAttrs (old: {
+  doCheck = false; #prev.stdenv.hostPlatform != "riscv64-linux";
+})
--- a/machines/ptv/pkgs-cross/libdrm/default.nix
+++ b/machines/ptv/pkgs-cross/libdrm/default.nix
@@ -0,0 +1,5 @@
+final: prev: prev.libdrm.overrideAttrs (old: {
+  buildInputs = old.buildInputs ++ [
+    final.libatomic_ops
+  ];
+})
--- a/machines/ptv/pkgs-cross/live555/default.nix
+++ b/machines/ptv/pkgs-cross/live555/default.nix
@@ -0,0 +1,8 @@
+final: prev: prev.live555.overrideAttrs (old: {
+  preConfigure = (prev.lib.optional (prev.stdenv.hostPlatform != prev.stdenv.buildPlatform) ''
+    sed -e 's/^C_COMPILER.*=.*$/C_COMPILER = $(CC)/g' -i config.*
+    sed -e 's/^CPLUSPLUS_COMPILER.*=.*$/CPLUSPLUS_COMPILER = $(CXX)/g' -i config.*
+    sed -e 's/^LINK.*=.*$/LINK = $(CXX) -o/g' -i config.*
+    sed -e 's/^LIBRARY_LINK.*=.*$/LIBRARY_LINK = $(AR) cr /g' -i config.*
+  '');
+})
--- a/machines/ptv/pkgs-cross/openfortivpn/default.nix
+++ b/machines/ptv/pkgs-cross/openfortivpn/default.nix
@@ -0,0 +1,5 @@
+final: prev: prev.openfortivpn.overrideAttrs (old: {
+  configureFlags = old.configureFlags ++ prev.lib.optionals (prev.stdenv.hostPlatform != prev.stdenv.buildPlatform) [
+    "--disable-proc"
+  ];
+})
--- a/machines/ptv/pkgs-cross/perlTestutf8/default.nix
+++ b/machines/ptv/pkgs-cross/perlTestutf8/default.nix
@@ -0,0 +1,42 @@
+final: prev: prev.perl538Packages.Testutf8.overrideAttrs (old: let
+  perl = final.perl538;
+in {
+  postInstall = prev.lib.optionalString (prev.stdenv.buildPlatform != prev.stdenv.hostPlatform) ''
+      mkdir -p $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI
+      cat > $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI.pm <<EOF
+      package DBI;
+      BEGIN {
+      our \$VERSION = "$version";
+      }
+      1;
+      EOF
+
+      autodir=$(echo $out/${perl.libPrefix}/${perl.version}/*/auto/DBI)
+      cat > $out/${perl.libPrefix}/cross_perl/${perl.version}/DBI/DBD.pm <<EOF
+      package DBI::DBD;
+      use Exporter ();
+      use vars qw (@ISA @EXPORT);
+      @ISA = qw(Exporter);
+      @EXPORT = qw(dbd_postamble);
+      sub dbd_postamble {
+          return '
+      # --- This section was generated by DBI::DBD::dbd_postamble()
+      DBI_INSTARCH_DIR=$autodir
+      DBI_DRIVER_XST=$autodir/Driver.xst
+
+      # The main dependency (technically correct but probably not used)
+      \$(BASEEXT).c: \$(BASEEXT).xsi
+
+      # This dependency is needed since MakeMaker uses the .xs.o rule
+      \$(BASEEXT)\$(OBJ_EXT): \$(BASEEXT).xsi
+
+      \$(BASEEXT).xsi: \$(DBI_DRIVER_XST) $autodir/Driver_xst.h
+      ''\t\$(PERL) -p -e "s/~DRIVER~/\$(BASEEXT)/g" \$(DBI_DRIVER_XST) > \$(BASEEXT).xsi
+
+      # ---
+      ';
+      }
+      1;
+      EOF
+    '';
+})
--- a/machines/ptv/pkgs-cross/protobuf/default.nix
+++ b/machines/ptv/pkgs-cross/protobuf/default.nix
@@ -0,0 +1,11 @@
+final: prev: prev.protobuf.overrideAttrs (old: {
+  # https://github.com/advancedtelematic/aktualizr/issues/1427
+  # atomics not supported, need either submit PR like suggested bove
+  # or, for now, use libatomic_ops
+  postPatch = old.postPatch + ''
+    sed -i -e 's/set(protobuf_LINK_LIBATOMIC false)/set(protobuf_LINK_LIBATOMIC true)/' CMakeLists.txt
+  '';
+  buildInputs = [
+    prev.libatomic_ops
+  ] ++ old.buildInputs;
+})
--- a/machines/ptv/pkgs-cross/valgrind/default.nix
+++ b/machines/ptv/pkgs-cross/valgrind/default.nix
@@ -0,0 +1,15 @@
+final: prev: prev.valgrind.overrideAttrs (old: {
+  src = prev.fetchFromGitHub {
+    owner = "petrpavlu";
+    repo = "valgrind-riscv64";
+    rev = "71272b252977fe52f03ea4fa8306b457b098cca5";
+    hash = "sha256-xD84dYSzq9eD35NfnmtI/zONVRjhDAEJkge26yFK034=";
+  };
+  outputs = [ "out" ];
+  patches = [
+    (prev.fetchpatch {
+      url = "https://bugsfiles.kde.org/attachment.cgi?id=149173";
+      sha256 = "sha256-jX9hD4utWRebbXMJYZ5mu9jecvdrNP05E5J+PnKRTyQ=";
+    })
+  ];
+})
--- a/machines/ptv/pkgs-cross/vpnc/default.nix
+++ b/machines/ptv/pkgs-cross/vpnc/default.nix
@@ -0,0 +1,3 @@
+final: prev: prev.vpnc.overrideAttrs (old: {
+  nativeBuildInputs = old.nativeBuildInputs ++ (prev.lib.optionals (prev.stdenv.hostPlatform != prev.stdenv.buildPlatform) [final.perl]);
+})
--- a/machines/ptv/pkgs-cross/vulkan-tools/default.nix
+++ b/machines/ptv/pkgs-cross/vulkan-tools/default.nix
@@ -0,0 +1,7 @@
+final: prev: prev.vulkan-tools.overrideAttrs (old: {
+  cmakeFlags = old.cmakeFlags ++ (prev.lib.optionals (prev.stdenv.hostPlatform != prev.stdenv.buildPlatform) [
+    "-DBUILD_CUBE=OFF"
+    "-DPKG_CONFIG_EXECUTABLE=${prev.buildPackages.pkg-config}/bin/riscv64-unknown-linux-gnu-pkg-config"
+  ]);
+})
+