Pinetab-v: rope in config

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;
+}

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

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;
+})

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

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`