From 47addd189d5496b1b73c3b1e101eace6dfe4bc90 Mon Sep 17 00:00:00 2001
From: Steve Mynott <steve.mynott@gmail.com>
Date: Mon, 29 Oct 2018 17:59:11 +0000
Subject: remove dead patches

---
 ...r-sep-for-separators-in-CompUnit-Reposito.patch | 69 ----------------------
 ...ith-OpenBSD-since-their-ancient-gcc-creat.patch | 19 ------
 tools/star/Makefile                                |  3 -
 3 files changed, 91 deletions(-)
 delete mode 100644 patches/0001-Use-SPEC.dir-sep-for-separators-in-CompUnit-Reposito.patch
 delete mode 100644 patches/0001-Use-clang-with-OpenBSD-since-their-ancient-gcc-creat.patch

diff --git a/patches/0001-Use-SPEC.dir-sep-for-separators-in-CompUnit-Reposito.patch b/patches/0001-Use-SPEC.dir-sep-for-separators-in-CompUnit-Reposito.patch
deleted file mode 100644
index 469b551..0000000
--- a/patches/0001-Use-SPEC.dir-sep-for-separators-in-CompUnit-Reposito.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-#From c3e1ec0bb86fad16ecca6ca5997d81cd6afc2ba5 Mon Sep 17 00:00:00 2001
-#From: Rob Hoelz <rob@hoelz.ro>
-#Date: Thu, 9 Aug 2018 21:31:43 -0500
-#Subject: [PATCH] Use $*SPEC.dir-sep for separators in
- #CompUnit::RepositoryRegistry
-
---- ../rakudo/src/core/CompUnit/RepositoryRegistry.pm6
-+++ ../rakudo/src/core/CompUnit/RepositoryRegistry.pm6
-@@ -10,6 +10,7 @@ class CompUnit::Repository::JavaRuntime { ... }
- #?endif
- 
- class CompUnit::RepositoryRegistry {
-+    my $sep := $*SPEC.dir-sep;
-     my $lock     = Lock.new;
-     my %include-spec2cur;
- 
-@@ -81,7 +82,7 @@ class CompUnit::RepositoryRegistry {
-           ?? nqp::atkey($ENV,'RAKUDO_PREFIX')
-           !! nqp::concat(
-                nqp::atkey(nqp::getcomp('perl6').config,'libdir'),
--               '/perl6'
-+               "{$sep}perl6"
-              );
- 
-         # XXX Various issues with this stuff on JVM , TEMPORARY
-@@ -96,14 +97,14 @@ class CompUnit::RepositoryRegistry {
-                    (nqp::existskey($ENV,'HOMEPATH')
-                      ?? nqp::atkey($ENV,'HOMEPATH') !! '')
-                  ) -> $home-path {
--                $home = "$home-path/.perl6";
-+                $home = "{$home-path}{$sep}.perl6";
-                 $home-spec = "inst#$home";
-             }
-         }
- 
-         # set up custom libs
--        my str $site = "inst#$prefix/site";
--        my str $vendor = "inst#$prefix/vendor";
-+        my str $site = "inst#{$prefix}{$sep}site";
-+        my str $vendor = "inst#{$prefix}{$sep}vendor";
-         my str $perl = "inst#$prefix";
- 
-         # your basic repo chain
-@@ -141,11 +142,11 @@ class CompUnit::RepositoryRegistry {
-             )) unless nqp::existskey($unique, $perl);
-             nqp::bindkey($custom-lib, 'vendor', $next-repo := self!register-repository(
-                 $vendor,
--                CompUnit::Repository::Installation.new(:prefix("$prefix/vendor"), :$next-repo)
-+                CompUnit::Repository::Installation.new(:prefix("{$prefix}{$sep}vendor"), :$next-repo)
-             )) unless nqp::existskey($unique, $vendor);
-             nqp::bindkey($custom-lib, 'site', $next-repo := self!register-repository(
-                 $site,
--                CompUnit::Repository::Installation.new(:prefix("$prefix/site"), :$next-repo)
-+                CompUnit::Repository::Installation.new(:prefix("{$prefix}{$sep}site"), :$next-repo)
-             )) unless nqp::existskey($unique, $site);
-             nqp::bindkey($custom-lib, 'home', $next-repo := self!register-repository(
-                 $home-spec,
-@@ -259,9 +260,9 @@ class CompUnit::RepositoryRegistry {
-         shift @*ARGS if $ver;
-         $name //= $dist-name;
-         my @installations = $*REPO.repo-chain.grep(CompUnit::Repository::Installation);
--        my @binaries = @installations.map({ .script("bin/$script", :$name, :$auth, :$ver) }).grep(*.defined);
-+        my @binaries = @installations.map({ .script("bin{$sep}$script", :$name, :$auth, :$ver) }).grep(*.defined);
-         unless +@binaries {
--            @binaries = flat @installations.map: { .script("bin/$script", :$name) };
-+            @binaries = flat @installations.map: { .script("bin{$sep}$script", :$name) };
-             if +@binaries {
-                 note "===SORRY!===\n"
-                     ~ "No candidate found for '$script' that match your criteria.\n"
diff --git a/patches/0001-Use-clang-with-OpenBSD-since-their-ancient-gcc-creat.patch b/patches/0001-Use-clang-with-OpenBSD-since-their-ancient-gcc-creat.patch
deleted file mode 100644
index 52d9346..0000000
--- a/patches/0001-Use-clang-with-OpenBSD-since-their-ancient-gcc-creat.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-# From abf7d0c282eae412159fef36ef85f08d333dff6b Mon Sep 17 00:00:00 2001
-# From: Steve Mynott <steve.mynott@gmail.com>
-# Date: Fri, 22 Jun 2018 16:07:08 +0100
-# Subject: [PATCH] Use clang with OpenBSD since their ancient gcc creates a moar
-# which can't generate NQP anymore.
-#
-#See #878
-
---- ../MoarVM/build/setup.pm
-+++ ../MoarVM/build/setup.pm
-@@ -583,7 +583,7 @@ our %SYSTEMS = (
-     linux       => [ qw( posix gnu   gcc ),   { %OS_LINUX } ],
-     aix         => [ qw( posix gnu   gcc ),   { %OS_AIX } ],
-     darwin      => [ qw( posix gnu   clang ), { %OS_DARWIN } ],
--    openbsd     => [ qw( posix bsd   gcc ),   { %OS_OPENBSD} ],
-+    openbsd     => [ qw( posix bsd   clang ),   { %OS_OPENBSD} ],
-     netbsd      => [ qw( posix bsd   gcc ),   { %OS_NETBSD } ],
-     dragonfly   => [ qw( posix bsd   gcc ),   { %OS_DRAGONFLY } ],
-     freebsd     => [ qw( posix bsd), $OS_FREEBSD{cc} , { %OS_FREEBSD } ],
diff --git a/tools/star/Makefile b/tools/star/Makefile
index de58fae..8c5963a 100644
--- a/tools/star/Makefile
+++ b/tools/star/Makefile
@@ -69,9 +69,6 @@ manifest: modules/DBIish/lib
 
 patch:
 	patch -p1 < patches/star-ver.patch
-	patch -p1 < patches/0001-Use-clang-with-OpenBSD-since-their-ancient-gcc-creat.patch
-	patch -p1 < patches/0001-Use-SPEC.dir-sep-for-separators-in-CompUnit-Reposito.patch
-
 
 tarball: manifest patch
 	[ -n "$(VERSION)" ] || ( echo "\nTry '$(MAKE) release VERSION=yyyy.mm'\n\n"; exit 1 )
-- 
cgit v1.1