Compare commits

...
10 changed files with 109 additions and 5 deletions

No files matched your search

+72
View File
@@ -3266,6 +3266,77 @@ case "$host" in
;;
esac
COREFX_PAL_SUPPORTED=no
COREFX_PAL_ARCH=
COREFX_PAL_OS=
case "$host" in
i*86-*-linux*)
COREFX_PAL_SUPPORTED=yes
COREFX_PAL_ARCH=x86
COREFX_PAL_OS=Linux
;;
i*86-*-darwin*)
COREFX_PAL_SUPPORTED=yes
COREFX_PAL_ARCH=x86
COREFX_PAL_OS=OSX
;;
i*86-*-freebsd*|i*86-*-kfreebsd-gnu*)
COREFX_PAL_SUPPORTED=yes
COREFX_PAL_ARCH=x86
COREFX_PAL_OS=FreeBSD
;;
x86_64-*-linux*|amd64-*-linux*)
COREFX_PAL_SUPPORTED=yes
COREFX_PAL_ARCH=x64
COREFX_PAL_OS=Linux
;;
x86_64-*-darwin*|amd64-*-darwin*)
COREFX_PAL_SUPPORTED=yes
COREFX_PAL_ARCH=x64
COREFX_PAL_OS=OSX
;;
x86_64-*-freebsd*|amd64-*-freebsd*|x86_64-*-kfreebsd-gnu*|amd64-*-kfreebsd-gnu*)
COREFX_PAL_SUPPORTED=yes
COREFX_PAL_ARCH=x64
COREFX_PAL_OS=FreeBSD
;;
arm*-*-darwin*)
COREFX_PAL_SUPPORTED=yes
COREFX_PAL_ARCH=arm
COREFX_PAL_OS=OSX
;;
arm*-*-linux*)
COREFX_PAL_SUPPORTED=yes
COREFX_PAL_ARCH=arm
COREFX_PAL_OS=Linux
;;
arm*-*-freebsd*|arm*-*-kfreebsd-gnu*)
COREFX_PAL_SUPPORTED=yes
COREFX_PAL_ARCH=arm
COREFX_PAL_OS=FreeBSD
;;
aarch64-*-darwin*)
COREFX_PAL_SUPPORTED=yes
COREFX_PAL_ARCH=arm64
COREFX_PAL_OS=OSX
;;
aarch64-*-linux*)
COREFX_PAL_SUPPORTED=yes
COREFX_PAL_ARCH=arm64
COREFX_PAL_OS=Linux
;;
aarch64-*-freebsd*|aarch64-*-kfreebsd-gnu*)
COREFX_PAL_SUPPORTED=yes
COREFX_PAL_ARCH=arm64
COREFX_PAL_OS=FreeBSD
;;
esac
AM_CONDITIONAL(COREFX_PAL_SUPPORTED, [test x$COREFX_PAL_SUPPORTED = xyes])
AC_SUBST(COREFX_PAL_ARCH)
AC_SUBST(COREFX_PAL_OS)
HOST=$TARGET
if test "x$host" != "x$target"; then
@@ -4426,6 +4497,7 @@ scripts/mono-find-provides
scripts/mono-find-requires
mono/Makefile
mono/btls/Makefile
mono/pal/Makefile
mono/utils/Makefile
mono/metadata/Makefile
mono/dis/Makefile
+1
View File
@@ -12,6 +12,7 @@
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
<dllmap dll="MonoPosixHelper" target="$mono_libdir/libMonoPosixHelper@libsuffix@" os="!windows" />
<dllmap dll="libmono-btls-shared" target="$mono_libdir/libmono-btls-shared@libsuffix@" os="!windows" />
<dllmap dll="System.Native" target="$mono_libdir/System.Native@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"/>
+1 -1
@@ -0,0 +1 @@
@@ -0,0 +1 @@
@@ -0,0 +1 @@
+8 -4
View File
@@ -6,11 +6,15 @@ if BTLS
btls_dirs = btls
endif
if COREFX_PAL_SUPPORTED
pal_dirs = pal
endif
if CROSS_COMPILING
SUBDIRS = $(btls_dirs) arch utils cil metadata $(sgen_dirs) mini dis profiler
SUBDIRS = $(btls_dirs) $(pal_dirs) arch utils cil metadata $(sgen_dirs) mini dis profiler
else
if INSTALL_MONOTOUCH
SUBDIRS = $(btls_dirs) arch utils metadata $(sgen_dirs) mini profiler
SUBDIRS = $(btls_dirs) $(pal_dirs) arch utils metadata $(sgen_dirs) mini profiler
monotouch-do-build:
@list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -34,7 +38,7 @@ monotouch-do-clean:
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
done;
else
SUBDIRS = $(btls_dirs) arch utils cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler
SUBDIRS = $(btls_dirs) $(pal_dirs) arch utils cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler
endif
endif
DIST_SUBDIRS = btls arch utils cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler
DIST_SUBDIRS = btls pal arch utils cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler
+3
View File
@@ -0,0 +1,3 @@
Makefile
Makefile.in
System.Native.*
+19
View File
@@ -0,0 +1,19 @@
COREFX_ROOT=$(abs_top_srcdir)/external/corefx
all-local:
$(COREFX_ROOT)/src/Native/build-native.sh $(COREFX_PAL_ARCH) Release $(COREFX_PAL_OS) \
cmakeargs -DCLR_DISABLE_SYSTEM_IO_COMPRESSION_NATIVE:BOOL=1 \
cmakeargs -DCLR_DISABLE_SYSTEM_NET_HTTP_NATIVE:BOOL=1 \
cmakeargs -DCLR_DISABLE_SYSTEM_NET_SECURITY_NATIVE:BOOL=1 \
cmakeargs -DCLR_DISABLE_SYSTEM_SECURITY_CRYPTOGRAPHY_NATIVE:BOOL=1 \
cmakeargs -DCLR_DISABLE_SYSTEM_SECURITY_CRYPTOGRAPHY_NATIVE_APPLE:BOOL=1
cp $(COREFX_ROOT)/bin/$(COREFX_PAL_OS).$(COREFX_PAL_ARCH).Release/native/System.Native$(libsuffix) System.Native$(libsuffix)
clean-local:
-rm -rf System.Native$(libsuffix)
-rm -rf $(COREFX_ROOT)/bin/$(COREFX_PAL_OS).$(COREFX_PAL_ARCH).Release
install-exec-local:
$(mkinstalldirs) "$(DESTDIR)$(libdir)"
$(install_sh) $(COREFX_ROOT)/bin/$(COREFX_PAL_OS).$(COREFX_PAL_ARCH).Release/native/System.Native$(libsuffix) "$(DESTDIR)$(libdir)"
+2
View File
@@ -185,6 +185,8 @@ etc/mono/config: ../data/config Makefile $(symlinks)
sed 's,target="$$mono_libdir/libMonoPosixHelper$(libsuffix)",target="'$$d'/libMonoPosixHelper.la",' ../data/config > $@t
d=`cd ../mono/btls/build-shared && pwd`; \
sed 's,target="$$mono_libdir/libmono-btls-shared$(libsuffix)",target="'$$d'/libmono-btls-shared$(libsuffix)",' $@t > $@tt
d=`cd ../mono/pal && pwd`; \
sed 's,target="$$mono_libdir/System.Native$(libsuffix)",target="'$$d'/System.Native$(libsuffix)",' $@t > $@tt
if test -z "$(libgdiplus_loc)"; then :; else \
sed 's,target="$(libgdiplus_install_loc)",target="$(libgdiplus_loc)",' $@tt > $@ttt; \
mv -f $@ttt $@tt; fi