diff options
| author | Alexis Christoforides <alexis@thenull.net> | 2017-02-13 15:14:09 +0300 |
|---|---|---|
| committer | Alexis Christoforides <alexis@thenull.net> | 2017-02-13 15:47:46 +0300 |
| commit | ac10f4e562ac5bf9768b4aa33b4745b3d6db4a86 (patch) | |
| tree | 19ef0ef86f71dddd68fa8c67cf0b0c7aaae626e8 /packaging/MacSDK | |
| parent | aad8adc02df726cbae7a176ee1a03651fd575b1a (diff) | |
[MacSDK] Update F#
Diffstat (limited to 'packaging/MacSDK')
| -rw-r--r-- | packaging/MacSDK/fsharp.py | 4 | ||||
| -rw-r--r-- | packaging/MacSDK/patches/fsharp-fix-mdb-support.patch | 29 |
2 files changed, 31 insertions, 2 deletions
diff --git a/packaging/MacSDK/fsharp.py b/packaging/MacSDK/fsharp.py index 9e5348975ee..a5af6000994 100644 --- a/packaging/MacSDK/fsharp.py +++ b/packaging/MacSDK/fsharp.py @@ -3,8 +3,8 @@ class FsharpPackage(GitHubTarballPackage): def __init__(self): GitHubTarballPackage.__init__(self, 'fsharp', 'fsharp', - '4.0.1.9', - '0a6c66a8f18eb8a5c4d0bfac61d883b6994a918a', + '4.0.1.20', + '9bd7c2420e06c1597ef5a37b6cb6e0f8d2911b10', configure='./configure --prefix="%{package_prefix}"') self.extra_stage_files = [ diff --git a/packaging/MacSDK/patches/fsharp-fix-mdb-support.patch b/packaging/MacSDK/patches/fsharp-fix-mdb-support.patch new file mode 100644 index 00000000000..576942ae47d --- /dev/null +++ b/packaging/MacSDK/patches/fsharp-fix-mdb-support.patch @@ -0,0 +1,29 @@ +commit 26e3e557e25b0ba5103dfb683050d2435f7708bb +Author: Ankit Jain <ankit.jain@xamarin.com> +Date: Wed Feb 8 18:44:41 2017 -0500 + + [msbuild] Add support for .mdb files to be copied, with mono's msbuild + + msbuild defaults to .pdb files as the default debug file extension. + Mono's msbuild has `$(_DebugFileExt)` property to override this. We need + to set that to `.mdb`, else the generated `.mdb` files won't get + copied/deployed. + + But this feature is not upstream yet, so it is not present in upstream + F# yet. + +diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.targets b/src/fsharp/FSharp.Build/Microsoft.FSharp.targets +index 82125d2..e7ddac2 100644 +--- a/src/fsharp/FSharp.Build/Microsoft.FSharp.targets ++++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.targets +@@ -40,6 +40,10 @@ Copyright (C) Microsoft Corporation. Apache 2.0 License. + <RootNamespace Condition="'$(RootNamespace)'==''">RootNamespace</RootNamespace> + <Actual32Bit Condition="'$(TargetFrameworkVersion)'=='v2.0' or '$(TargetFrameworkVersion)'=='v3.0' or '$(TargetFrameworkVersion)'=='v3.5' or '$(TargetFrameworkVersion)'=='v4.0'">false</Actual32Bit> + <Actual32Bit Condition="!('$(TargetFrameworkVersion)'=='v2.0' or '$(TargetFrameworkVersion)'=='v3.0' or '$(TargetFrameworkVersion)'=='v3.5' or '$(TargetFrameworkVersion)'=='v4.0')">$(Prefer32Bit)</Actual32Bit> ++ ++ <!-- _DebugFileExt is not an upstream msbuild feature yet --> ++ <_DebugFileExt Condition="'$(FscDebugFileExt)' != ''">$(FscDebugFileExt)</_DebugFileExt> ++ <_DebugFileExt Condition="'$(_DebugFileExt)' == ''">.mdb</_DebugFileExt> + </PropertyGroup> + + <!-- |