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

Merge branch 'upstream'

Browse Source 
Former-commit-id: 582b6e4d09f55b4e07d0821d58c0a21883749797
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-05-29 09:25:39 +00:00
commit 3a567c352d
155 changed files with 1067 additions and 794 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -382,6 +382,7 @@ SHELL = @SHELL@
SIZEOF_VOID_P = @SIZEOF_VOID_P@
SQLITE = @SQLITE@
SQLITE3 = @SQLITE3@
STATIC_GCC_LIBS = @STATIC_GCC_LIBS@
STATIC_ZLIB_PATH = @STATIC_ZLIB_PATH@
STRIP = @STRIP@
TEST_PROFILE = @TEST_PROFILE@

2
acceptance-tests/Makefile.in.REMOVED.git-id
View File

@ -1 +1 @@
83c0c15449e686f77a3888c04ba3b7942733bb25
82211f291c887f62ce30cc2305884e307855ecd8

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
e51c0e1f864d708f76cd1c664b2e141b1248df61
b4f0760a37d6ddf719a54078d952ec1b1e471435

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
f4d1ed8dc18898ec8c74a2831a50329d54f05d95
e11bcccdba2e961d4e81ff05c08677f97826ade0

1
data/Makefile.in
View File

@ -406,6 +406,7 @@ SHELL = @SHELL@
SIZEOF_VOID_P = @SIZEOF_VOID_P@
SQLITE = @SQLITE@
SQLITE3 = @SQLITE3@
STATIC_GCC_LIBS = @STATIC_GCC_LIBS@
STATIC_ZLIB_PATH = @STATIC_ZLIB_PATH@
STRIP = @STRIP@
TEST_PROFILE = @TEST_PROFILE@

1
data/net_2_0/Browsers/Makefile.in
View File

@ -327,6 +327,7 @@ SHELL = @SHELL@
SIZEOF_VOID_P = @SIZEOF_VOID_P@
SQLITE = @SQLITE@
SQLITE3 = @SQLITE3@
STATIC_GCC_LIBS = @STATIC_GCC_LIBS@
STATIC_ZLIB_PATH = @STATIC_ZLIB_PATH@
STRIP = @STRIP@
TEST_PROFILE = @TEST_PROFILE@

1
data/net_2_0/Makefile.in
View File

@ -387,6 +387,7 @@ SHELL = @SHELL@
SIZEOF_VOID_P = @SIZEOF_VOID_P@
SQLITE = @SQLITE@
SQLITE3 = @SQLITE3@
STATIC_GCC_LIBS = @STATIC_GCC_LIBS@
STATIC_ZLIB_PATH = @STATIC_ZLIB_PATH@
STRIP = @STRIP@
TEST_PROFILE = @TEST_PROFILE@

1
data/net_4_0/Browsers/Makefile.in
View File

@ -327,6 +327,7 @@ SHELL = @SHELL@
SIZEOF_VOID_P = @SIZEOF_VOID_P@
SQLITE = @SQLITE@
SQLITE3 = @SQLITE3@
STATIC_GCC_LIBS = @STATIC_GCC_LIBS@
STATIC_ZLIB_PATH = @STATIC_ZLIB_PATH@
STRIP = @STRIP@
TEST_PROFILE = @TEST_PROFILE@

1
data/net_4_0/Makefile.in
View File

@ -387,6 +387,7 @@ SHELL = @SHELL@
SIZEOF_VOID_P = @SIZEOF_VOID_P@
SQLITE = @SQLITE@
SQLITE3 = @SQLITE3@
STATIC_GCC_LIBS = @STATIC_GCC_LIBS@
STATIC_ZLIB_PATH = @STATIC_ZLIB_PATH@
STRIP = @STRIP@
TEST_PROFILE = @TEST_PROFILE@

1
data/net_4_5/Browsers/Makefile.in
View File

@ -327,6 +327,7 @@ SHELL = @SHELL@
SIZEOF_VOID_P = @SIZEOF_VOID_P@
SQLITE = @SQLITE@
SQLITE3 = @SQLITE3@
STATIC_GCC_LIBS = @STATIC_GCC_LIBS@
STATIC_ZLIB_PATH = @STATIC_ZLIB_PATH@
STRIP = @STRIP@
TEST_PROFILE = @TEST_PROFILE@

1
data/net_4_5/Makefile.in
View File

@ -387,6 +387,7 @@ SHELL = @SHELL@
SIZEOF_VOID_P = @SIZEOF_VOID_P@
SQLITE = @SQLITE@
SQLITE3 = @SQLITE3@
STATIC_GCC_LIBS = @STATIC_GCC_LIBS@
STATIC_ZLIB_PATH = @STATIC_ZLIB_PATH@
STRIP = @STRIP@
TEST_PROFILE = @TEST_PROFILE@

1
docs/Makefile.in
View File

@ -328,6 +328,7 @@ SHELL = @SHELL@
SIZEOF_VOID_P = @SIZEOF_VOID_P@
SQLITE = @SQLITE@
SQLITE3 = @SQLITE3@
STATIC_GCC_LIBS = @STATIC_GCC_LIBS@
STATIC_ZLIB_PATH = @STATIC_ZLIB_PATH@
STRIP = @STRIP@
TEST_PROFILE = @TEST_PROFILE@

2
external/api-snapshot/profiles/monotouch/mscorlib.cs.REMOVED.git-id vendored
View File

@ -1 +1 @@
f37b7c2d4c39f0e7037808844a6da37a890cc5d5
4d40b57c3c756e46690a132fe42760103ba01619

1
ikvm-native/Makefile.in
View File

@ -375,6 +375,7 @@ SHELL = @SHELL@
SIZEOF_VOID_P = @SIZEOF_VOID_P@
SQLITE = @SQLITE@
SQLITE3 = @SQLITE3@
STATIC_GCC_LIBS = @STATIC_GCC_LIBS@
STATIC_ZLIB_PATH = @STATIC_ZLIB_PATH@
STRIP = @STRIP@
TEST_PROFILE = @TEST_PROFILE@

5
llvm/Makefile.in
View File

@ -298,6 +298,7 @@ SHELL = @SHELL@
SIZEOF_VOID_P = @SIZEOF_VOID_P@
SQLITE = @SQLITE@
SQLITE3 = @SQLITE3@
STATIC_GCC_LIBS = @STATIC_GCC_LIBS@
STATIC_ZLIB_PATH = @STATIC_ZLIB_PATH@
STRIP = @STRIP@
TEST_PROFILE = @TEST_PROFILE@
@ -408,7 +409,9 @@ LLVM_VERSION := $(shell git -C "$(abs_top_srcdir)/external/llvm" rev-parse HEAD)
# FIXME: URL should be http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-$(LLVM_BRANCH)/llvm-osx64-$(LLVM_VERSION).tar.gz
LLVM_DOWNLOAD_LOCATION = "http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-release60/llvm-osx64-$(LLVM_VERSION).tar.gz"
NINJA := $(shell which ninja)
EXTRA_LLVM_ARGS = $(if $(filter $(LLVM_TARGET),wasm32), -DLLVM_BUILD_32_BITS=On -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="WebAssembly",)
EXTRA_LLVM_ARGS = $(if $(filter $(LLVM_TARGET),wasm32), -DLLVM_BUILD_32_BITS=On -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="WebAssembly",) \
$(if $(STATIC_GCC_LIBS),-DCMAKE_EXE_LINKER_FLAGS="-static")
all: all-am
.SUFFIXES:

3
llvm/build.mk
View File

@ -15,7 +15,8 @@ NINJA := $(shell which ninja)
$(LLVM_BUILD) $(LLVM_PREFIX):
mkdir -p $@
EXTRA_LLVM_ARGS = $(if $(filter $(LLVM_TARGET),wasm32), -DLLVM_BUILD_32_BITS=On -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="WebAssembly",)
EXTRA_LLVM_ARGS = $(if $(filter $(LLVM_TARGET),wasm32), -DLLVM_BUILD_32_BITS=On -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="WebAssembly",) \
$(if $(STATIC_GCC_LIBS),-DCMAKE_EXE_LINKER_FLAGS="-static")
# -DLLVM_ENABLE_LIBXML2=Off is needed because xml2 is not used and it breaks 32-bit builds on 64-bit Linux hosts
$(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(abs_top_srcdir)/external/llvm/CMakeLists.txt | $(LLVM_BUILD) $(LLVM_PREFIX)

1
m4/Makefile.in
View File

@ -297,6 +297,7 @@ SHELL = @SHELL@
SIZEOF_VOID_P = @SIZEOF_VOID_P@
SQLITE = @SQLITE@
SQLITE3 = @SQLITE3@
STATIC_GCC_LIBS = @STATIC_GCC_LIBS@
STATIC_ZLIB_PATH = @STATIC_ZLIB_PATH@
STRIP = @STRIP@
TEST_PROFILE = @TEST_PROFILE@

1
man/Makefile.in
View File

@ -329,6 +329,7 @@ SHELL = @SHELL@
SIZEOF_VOID_P = @SIZEOF_VOID_P@
SQLITE = @SQLITE@
SQLITE3 = @SQLITE3@
STATIC_GCC_LIBS = @STATIC_GCC_LIBS@
STATIC_ZLIB_PATH = @STATIC_ZLIB_PATH@
STRIP = @STRIP@
TEST_PROFILE = @TEST_PROFILE@

2
mcs/build/common/Consts.cs
View File

@ -41,7 +41,7 @@ static partial class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "6.0.0.265";
public const string MonoVersion = "6.0.0.271";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

2
mcs/build/platforms/macos.make
View File

@ -6,7 +6,7 @@
PLATFORM_MCS_FLAGS =
PLATFORM_RUNTIME = $(RUNTIME)
PLATFORM_CORLIB = mscorlib.dll
PLATFORM_TEST_HARNESS_EXCLUDES = NotOnMac,MacNotWorking,
PLATFORM_TEST_HARNESS_EXCLUDES = NotOnMac MacNotWorking
EXTERNAL_MCS = mcs
EXTERNAL_MBAS = mbas

Some files were not shown because too many files have changed in this diff Show More