Compare commits

...
Author SHA1 Message Date
Alex Corrado 3f71a4bfc2 Update fsharp.py 2019-11-24 14:06:21 -05:00
Alex Corrado 394ed52275 Update fsharp.py 2019-11-23 21:12:53 -05:00
Alex Corrado 8a2d0cb8a7 Update fsharp.py 2019-11-22 23:25:41 -05:00
Alex Corrado 670e1ea3cb [fsharp] Remove failing patch 2019-11-22 18:35:53 -05:00
Alex Corrado c759092277 [fsharp] Try to build with F# 4.7 2019-11-22 14:58:32 -05:00
3 changed files with 4 additions and 46 deletions

No files matched your search

+4 -8
View File
@@ -1,18 +1,14 @@
class FsharpPackage(GitHubTarballPackage):
def __init__(self):
GitHubTarballPackage.__init__(self,
'fsharp', 'fsharp',
'4.5.0',
'3de387432de8d11a89f99d1af87aa9ce194fe21b',
'mono', 'fsharp',
'4.7.0',
'758e81e608fd836c8e91231c86da0d7275e611fd',
configure='',
override_properties={ 'make': 'make all install PREFIX="%{package_prefix}" DESTDIR=%{stage_root}' })
self.extra_stage_files = ['lib/mono/xbuild/Microsoft/VisualStudio/v/FSharp/Microsoft.FSharp.Targets']
self.sources.extend(['patches/fsharp-IsPathRooted-type-inference.patch',
'patches/fsharp-portable-pdb.patch',
'patches/fsharp-noinstall.patch',
'patches/fsharp-GetFileNameWithoutExtension-type-inference.patch',
'patches/fsharp-msbuild-16-0.patch',
self.sources.extend(['patches/fsharp-portable-pdb.patch',
'patches/fsharp-custom-prefix.patch'])
def prep(self):
@@ -1,21 +0,0 @@
commit c37fce5b3019c7a150203fc3a484885591b194de
Author: Alexis Christoforides <[email protected]>
Date: Sun Dec 2 00:10:24 2018 -0500
Help Path.IsPathRooted method overload selection.
.NET Core, and Mono after merging https://github.com/mono/mono/pull/11342, introduce ambiguity with a new overload.
diff --git a/src/scripts/scriptlib.fsx b/src/scripts/scriptlib.fsx
index cc797e305..699c7bb93 100644
--- a/src/scripts/scriptlib.fsx
+++ b/src/scripts/scriptlib.fsx
@@ -92,7 +92,7 @@ module Scripting =
module Process =
- let processExePath baseDir exe =
+ let processExePath baseDir (exe:string) =
if Path.IsPathRooted(exe) then exe
else
match Path.GetDirectoryName(exe) with
@@ -1,17 +0,0 @@
diff --git a/mono/config.make b/mono/config.make
index 00bd4a0..136c644 100644
--- a/mono/config.make
+++ b/mono/config.make
@@ -144,6 +144,12 @@ NO_DIST = .gitignore lib/debug lib/proto lib/release
#
install-sdk-lib:
@echo "Installing $(ASSEMBLY)"
+ @echo "Dest dir"
+ @ls -la $(DESTDIR)
+ @chmod +w $(DESTDIR)
+ @ls -la $(DESTDIR)
+ @echo "Mono dir"
@mkdir -p $(DESTDIR)$(monodir)/fsharp
+ @ls -la $(DESTDIR)$(monodir)
@if test "x$(DELAY_SIGN)" = "x1"; then \
echo "Signing $(outdir)$(ASSEMBLY) with Mono key"; \