[Pkg-cli-apps-commits] [fsharp] 02/04: Drop disable-debug-symbols patch; replace with dependency on compilerservices-symbolwriter.

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to branch master
in repository fsharp.

commit 3d823cbde4de4f7c6699a095b6e23862d578c632
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date:   Sat Feb 8 21:39:56 2014 +1100

    Drop disable-debug-symbols patch; replace with dependency on compilerservices-symbolwriter.
    
    Turns out this actually *does* provide the debug symbols writer.
    LP: 1259230
---
 debian/control                                   |  1 +
 debian/patches/never-ask-for-debug-symbols.patch | 37 ------------------------
 debian/patches/series                            |  1 -
 3 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/debian/control b/debian/control
index ebe44f1..42d1060 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Architecture: all
 Depends:
   fsharp,
   libfsharp-compiler-interactive-settings4.3-cil (= ${binary:Version}),
+  libmono-compilerservices-symbolwriter4.0-cil,
   ${cli:Depends},
   ${shlibs:Depends},
   ${misc:Depends}
diff --git a/debian/patches/never-ask-for-debug-symbols.patch b/debian/patches/never-ask-for-debug-symbols.patch
deleted file mode 100644
index 355ba30..0000000
--- a/debian/patches/never-ask-for-debug-symbols.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 11080dbd25c36e7159aeacecbd0d4f1da68b2d7b
-Author: Christopher James Halse Rogers <raof at ubuntu.com>
-Date:   Fri Jan 17 13:09:19 2014 +1100
-
-    Never generate debug symbols for dynamic assemblies on Mono.
-    
-    Mono does not support generating symbols for dynamic code, and has no
-    current plans to do so (cf: https://bugzilla.xamarin.com/show_bug.cgi?id=5186).
-    
-    This causes fsi to die with a ‘The assembly for default symbol writer cannot be loaded’
-    exception shortly after loading when debugging info is requested, which it is
-    by default.
-
-diff --git a/src/absil/ilreflect.fs b/src/absil/ilreflect.fs
-index e496c47..5ad6458 100755
---- a/src/absil/ilreflect.fs
-+++ b/src/absil/ilreflect.fs
-@@ -2104,7 +2104,8 @@ let mkDynamicAssemblyAndModule (assemblyName, optimize, debugInfo) =
-         let daBuilder = new CustomAttributeBuilder(daCtor, [| System.Diagnostics.DebuggableAttribute.DebuggingModes.DisableOptimizations ||| System.Diagnostics.DebuggableAttribute.DebuggingModes.Default  |])
-         asmB.SetCustomAttributeAndLog(daBuilder);
-     
--    let modB = asmB.DefineDynamicModuleAndLog(assemblyName,filename,debugInfo)
-+    // Mono does not support emitting debug symbols for dynamic modules - https://bugzilla.xamarin.com/show_bug.cgi?id=5186
-+    let modB = asmB.DefineDynamicModuleAndLog(assemblyName,filename,if runningOnMono then false else debugInfo)
- #endif    
-     asmB,modB
- 
-@@ -2113,7 +2114,8 @@ type EntryDelegate = delegate of unit -> unit
- #endif
- 
- let emitModuleFragment (ilg, emEnv, asmB : AssemblyBuilder, modB : ModuleBuilder, modul : IL.ILModuleDef, debugInfo : bool, resolvePath) =
--    let cenv = { ilg = ilg ; generatePdb = debugInfo; resolvePath=resolvePath }
-+    // Mono does not support emitting debug symbols for dynamic modules - https://bugzilla.xamarin.com/show_bug.cgi?id=5186
-+    let cenv = { ilg = ilg ; resolvePath=resolvePath ; generatePdb = if runningOnMono then false else debugInfo ; }
- 
-     let emEnv = buildModuleFragment cenv emEnv asmB modB modul
-     match modul.Manifest with 
diff --git a/debian/patches/series b/debian/patches/series
index 9242fec..e97b933 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 build-only-4.0-libs.patch
 debian-cli-policy.patch
-never-ask-for-debug-symbols.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git