Djam/mono
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/mono.git synced 2025-02-23 13:52:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix search path for x86_64 version

Browse source
This commit is contained in:
Andrey Bondrov 2017-08-25 09:47:28 +10:00
parent a1d3f08f00
commit 1b68cada3a
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mono-4.6.0-config.patch Normal file
View file

@ -0,0 +1,12 @@
diff -urN mono-4.6.0/data/config.in mono-4.6.0-patched/data/config.in
--- mono-4.6.0/data/config.in 2016-08-25 12:15:50.000000000 +0300
+++ mono-4.6.0-patched/data/config.in 2017-08-23 06:21:09.579903848 +0300
@@ -10,7 +10,7 @@
<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
- <dllmap dll="MonoPosixHelper" target="$mono_libdir/libMonoPosixHelper@libsuffix@" os="!windows" />
+ <dllmap dll="MonoPosixHelper" target="@prefix@/@reloc_libdir@/libMonoPosixHelper@libsuffix@" os="!windows" />
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>

5
mono.spec
View file

@ -22,7 +22,7 @@
Summary: Mono Runtime Summary: Mono Runtime
Name: mono Name: mono
Version: 4.6.0 Version: 4.6.0
Release: %{rev}.2 Release: %{rev}.3
License: GPLv2 and LGPLv2+ and MIT License: GPLv2 and LGPLv2+ and MIT
Group: Development/C# Group: Development/C#
Url: http://www.go-mono.com/ Url: http://www.go-mono.com/
@ -38,6 +38,8 @@ Source2: Microsoft.Portable.Common.targets
Patch0: mono-dllmap.patch Patch0: mono-dllmap.patch
# (fc) 1.2.3.1-4mdv disable using /proc/self/exe to detect root prefix, it breaks under unionfs # (fc) 1.2.3.1-4mdv disable using /proc/self/exe to detect root prefix, it breaks under unionfs
Patch1: mono-2.6-selfexe.patch Patch1: mono-2.6-selfexe.patch
# Fix search path for x86_64 version
Patch2: mono-4.6.0-config.patch
Patch4: mono-wapi_glop.patch Patch4: mono-wapi_glop.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: bison BuildRequires: bison
@ -1444,6 +1446,7 @@ Mono implementation of WCF, Windows Communication Foundation.
cp %{SOURCE2} mcs/tools/xbuild/targets/ cp %{SOURCE2} mcs/tools/xbuild/targets/
%patch0 -p1 -b .dllmap %patch0 -p1 -b .dllmap
%patch1 -p1 -b .selfexe %patch1 -p1 -b .selfexe
%patch2 -p1 -b .config
%patch4 -p1 -b .glop %patch4 -p1 -b .glop
autoconf autoconf