mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't rely on system Mono to use ikdasm

Browse Source 
Since ikdasm is managed (monodis was unmanaged), we need to manually invoke the .exe with our self-built mono, otherwise it tries to use /usr/bin/mono which probably doesn't exist yet.


Former-commit-id: 8058924c0c3d5213ba893aafed2dedefc66c79cc
This commit is contained in:
Jo Shields 2017-03-15 11:26:37 +00:00
parent a49c268867
commit 21e1603b37
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/dh_clideps vendored
View File

@ -191,7 +191,7 @@ if ($dh{L_PARAMS}) {
if (defined($dh{INTERNAL_MONO_FLAG}) || if (defined($dh{INTERNAL_MONO_FLAG}) ||
(defined($ARGV[0]) && $ARGV[0] eq "internal-mono")) { (defined($ARGV[0]) && $ARGV[0] eq "internal-mono")) {
$clr = "mono"; $clr = "mono";
$cli_parser = "$pwd/debian/tmp/usr/bin/ikdasm"; $cli_parser = "$mono_path debian/tmp/usr/bin/mono debian/tmp/usr/lib/mono/4.5/ikdasm.exe";
$cli_parser_paths = "LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib MONO_PATH=$mono_path:$pwd/debian/tmp/usr/lib/mono/4.5 MONO_GAC_PREFIX=$mono_gac_prefix "; $cli_parser_paths = "LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib MONO_PATH=$mono_path:$pwd/debian/tmp/usr/lib/mono/4.5 MONO_GAC_PREFIX=$mono_gac_prefix ";
$cli_version = `LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib $pwd/debian/tmp/usr/bin/mono --version 2>&1`; $cli_version = `LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib $pwd/debian/tmp/usr/bin/mono --version 2>&1`;
verbose_print("Will use built Mono (debian/tmp/usr/bin/ikdasm) for CIL parsing."); verbose_print("Will use built Mono (debian/tmp/usr/bin/ikdasm) for CIL parsing.");

2
debian/dh_makeclilibs vendored
View File

@ -135,7 +135,7 @@ if (defined($dh{INTERNAL_MONO_FLAG}) ||
(defined($ARGV[0]) && $ARGV[0] eq "internal-mono")) { (defined($ARGV[0]) && $ARGV[0] eq "internal-mono")) {
$clr = "mono"; $clr = "mono";
my $mono_path = "LD_LIBRARY_PATH=debian/tmp/usr/lib MONO_PATH=debian/tmp/usr/lib/mono/4.5 MONO_CFG_DIR=debian/tmp/etc"; my $mono_path = "LD_LIBRARY_PATH=debian/tmp/usr/lib MONO_PATH=debian/tmp/usr/lib/mono/4.5 MONO_CFG_DIR=debian/tmp/etc";
$cli_parser = "$mono_path debian/tmp/usr/bin/ikdasm"; $cli_parser = "$mono_path debian/tmp/usr/bin/mono debian/tmp/usr/lib/mono/4.5/ikdasm.exe";
$sn = "$mono_path debian/tmp/usr/bin/mono debian/tmp/usr/lib/mono/4.5/sn.exe"; $sn = "$mono_path debian/tmp/usr/bin/mono debian/tmp/usr/lib/mono/4.5/sn.exe";
verbose_print("Will use build Mono (debian/tmp/usr/bin/ikdasm) for CIL parsing."); verbose_print("Will use build Mono (debian/tmp/usr/bin/ikdasm) for CIL parsing.");
} elsif (-x "/usr/bin/ikdasm") { } elsif (-x "/usr/bin/ikdasm") {