Numerous changes to toolchain optional packages and world default packages

bin/head - accept -[num] style arguments
usr.bin/uname - alias -o to -s

toolchain/Makefile

@@ -4,15 +4,22 @@
 
 include toolchain.mk
 
-subdirs += binutils
-subdirs += gcc-pass1
-subdirs += linux-headers
 ifeq ($(build_gawk), 1)
 subdirs += gawk
 endif
 ifeq ($(build_pax), 1)
 subdirs += pax
 endif
+ifeq ($(build_perl), 1)
+subdirs += perl
+subdirs += xml-parser
+endif
+ifeq ($(build_python), 1)
+subdirs += python
+endif
+subdirs += binutils
+subdirs += gcc-pass1
+subdirs += linux-headers
 subdirs += glibc
 subdirs += gcc-pass2
 

toolchain/gawk/Makefile

@@ -2,6 +2,6 @@
 #  Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
 #
 distname = gawk
-include world.mk
+include toolchain.mk
 config_opts += --disable-nls
 include targets.mk

toolchain/intltool/Makefile

@@ -0,0 +1,9 @@
+#  Makefile - hhl - /usr/src/world/intltool
+#  Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
+#
+distname      = intltool
+distext       = gz
+patches       = intltool-perl-warning.patch
+include toolchain.mk
+
+include targets.mk

toolchain/intltool/intltool-perl-warning.patch

@@ -0,0 +1,51 @@
+diff -Naur intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-update.in
+--- intltool-0.51.0.orig/intltool-update.in	2015-03-08 21:39:54.000000000 -0400
++++ intltool-0.51.0/intltool-update.in	2020-05-31 18:49:45.382651247 -0400
+@@ -1062,13 +1062,13 @@
+ 	}
+     }
+ 
+-    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
++    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
+     {
+ 	my $rest = $3;
+ 	my $untouched = $1;
+ 	my $sub = "";
+         # Ignore recursive definitions of variables
+-        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
++        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/;
+ 
+ 	return SubstituteVariable ("$untouched$sub$rest");
+     }
+@@ -1190,10 +1190,10 @@
+ 	$name    =~ s/\(+$//g;
+ 	$version =~ s/\(+$//g;
+ 
+-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
++	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
++	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
++	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
+     }
+ 
+     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
+@@ -1219,11 +1219,11 @@
+ 	$version =~ s/\(+$//g;
+         $bugurl  =~ s/\(+$//g if (defined $bugurl);
+ 
+-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
+-        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
++	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
++	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
++	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
++	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
++        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
+     }
+ 
+     # \s makes this not work, why?

toolchain/perl/Makefile

@@ -0,0 +1,21 @@
+#  Makefile - hhl - /usr/src/world/perl
+#  Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
+#
+distname           = perl
+export BUILD_ZLIB  = False
+export BUILD_BZIP2 = 0
+
+config_opts        = -des
+config_opts       += -Dmksymlinks
+config_opts       += -Dprefix=/toolchain
+config_opts       += -Dvendorprefix=/usr
+config_opts       += -Dman1dir=/toolchain/share/man/man1
+config_opts       += -Dman3dir=/toolchain/share/man/man3
+config_opts       += -Duseshrplib
+config_opts       += -Dusethreads
+
+include toolchain.mk
+
+config_cmd         = cd $(objdir) && $(srcdir)/Configure $(config_opts)
+
+include targets.mk

toolchain/python/Makefile

@@ -0,0 +1,15 @@
+#  Makefile - hhl - /usr/src/world/python
+#  Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
+#
+distname      = python
+include versions.mk
+distfullname  = Python-$(python_version)
+include toolchain.mk
+
+config_opts  += --enable-ipv6
+config_opts  += --enable-shared
+config_opts  += --with-system-expat
+config_opts  += --with-system-ffi
+config_opts  += --with-ensurepip=yes
+
+include targets.mk

toolchain/xml-parser/Makefile

@@ -0,0 +1,9 @@
+#  Makefile - hhl - /usr/src/world/xml-parser
+#  Copyright 2020 Nathan Fisher <nfisher.sr@gmail.com>
+#
+distname   = XML-Parser
+distext    = gz
+no_objdir  = 1
+include toolchain.mk
+config_cmd = cd $(srcdir) && perl Makefile.PL
+include targets.mk