summaryrefslogtreecommitdiff
path: root/patches/mono/mono-build-keyfile.diff
diff options
context:
space:
mode:
Diffstat (limited to 'patches/mono/mono-build-keyfile.diff')
-rw-r--r--patches/mono/mono-build-keyfile.diff89
1 files changed, 0 insertions, 89 deletions
diff --git a/patches/mono/mono-build-keyfile.diff b/patches/mono/mono-build-keyfile.diff
deleted file mode 100644
index 29d40c516..000000000
--- a/patches/mono/mono-build-keyfile.diff
+++ /dev/null
@@ -1,89 +0,0 @@
----
- cli_ure/prj/d.lst | 4 +++-
- cli_ure/source/basetypes/makefile.mk | 6 +++---
- cli_ure/source/bootstrap/makefile.mk | 2 +-
- cli_ure/source/ure/makefile.mk | 4 ++--
- 4 files changed, 9 insertions(+), 7 deletions(-)
-
-diff --git cli_ure/prj/d.lst cli_ure/prj/d.lst
-index 56eab2d..f08e25e 100644
---- cli_ure/prj/d.lst
-+++ cli_ure/prj/d.lst
-@@ -11,4 +11,6 @@
-
- ..\%__SRC%\bin\cliuno.snk %_DEST%\bin%_EXT%\cliuno.snk
-
--..\%__SRC%\bin\cliureversion.mk %_DEST%\bin%_EXT%\cliureversion.mk
-\ No newline at end of file
-+..\%__SRC%\bin\cliureversion.mk %_DEST%\bin%_EXT%\cliureversion.mk
-+
-+..\%__SRC%\bin\cliuno.snk %_DEST%\bin%_EXT%\cliuno.snk
-diff --git cli_ure/source/basetypes/makefile.mk cli_ure/source/basetypes/makefile.mk
-index 761df58..e24b6fb 100644
---- cli_ure/source/basetypes/makefile.mk
-+++ cli_ure/source/basetypes/makefile.mk
-@@ -47,8 +47,8 @@ POLICY_ASSEMBLY_FILE=$(BIN)$/$(CLI_BASETYPES_POLICY_ASSEMBLY).dll
- ALLTAR : \
- $(BIN)$/cli_basetypes.dll \
- $(POLICY_ASSEMBLY_FILE)
--
--.IF "$(CCNUMVER)" >= "001399999999"
-+
-+.IF "$(COM)" != "MSC" || "$(CCNUMVER)" >= "001399999999"
- CSCFLAGS+=-keyfile:"$(BIN)$/cliuno.snk"
- .ENDIF
-
-@@ -63,7 +63,7 @@ CSFILES = \
- uno$/PolymorphicType.cs \
- $(ASSEMBLY_ATTRIBUTES)
-
--.IF "$(CCNUMVER)" <= "001399999999"
-+.IF "$(COM)" == "MSC" && "$(CCNUMVER)" <= "001399999999"
- $(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk
- $(GNUCOPY) -p assembly.cs $@
- echo \
-diff --git cli_ure/source/bootstrap/makefile.mk cli_ure/source/bootstrap/makefile.mk
-index a00f7a0..9c6eea2 100644
---- cli_ure/source/bootstrap/makefile.mk
-+++ cli_ure/source/bootstrap/makefile.mk
-@@ -71,7 +71,6 @@ $(ASSEMBLY_ATTRIBUTES) .PHONY: assembly.cs $(BIN)$/cliuno.snk $(BIN)$/cliurevers
- $(GNUCOPY) -p assembly.cs $@
- +echo $(ECHOQUOTE) \
- [assembly:System.Reflection.AssemblyVersion( "$(CLI_CPPUHELPER_NEW_VERSION)" )] $(ECHOQUOTE) \
-- $(ECHOQUOTE) [assembly:System.Reflection.AssemblyKeyFile($(ASSEMBLY_KEY))] $(ECHOQUOTE) \
- >> $@
-
- EXTERNAL_DIR=$(PRJ)$/..$/external/cli
-@@ -83,6 +82,7 @@ $(BIN)$/cli_cppuhelper.dll : $(CSFILES) $(OUT)$/bin$/cli_uretypes.dll
- +$(CSC) $(CSCFLAGS) \
- -target:library \
- -out:$@ \
-+ -keyfile:$(BIN)$/cliuno.snk \
- -reference:$(OUT)$/bin$/cli_uretypes.dll \
- -reference:System.dll \
- $(CSFILES)
-diff --git cli_ure/source/ure/makefile.mk cli_ure/source/ure/makefile.mk
-index 2a3c16b..bc1b962 100644
---- cli_ure/source/ure/makefile.mk
-+++ cli_ure/source/ure/makefile.mk
-@@ -48,7 +48,7 @@ ALLTAR : \
- $(BIN)$/cli_ure.dll \
- $(POLICY_ASSEMBLY_FILE)
-
--.IF "$(CCNUMVER)" >= "001399999999"
-+.IF "$(COM)" != "MSC" || "$(CCNUMVER)" >= "001399999999"
- CSCFLAGS+=-keyfile:"$(BIN)$/cliuno.snk"
- .ENDIF
-
-@@ -59,7 +59,7 @@ CSFILES = \
- uno$/util$/ManagedCodeLoader.cs \
- $(ASSEMBLY_ATTRIBUTES)
-
--.IF "$(CCNUMVER)" <= "001399999999"
-+.IF "$(COM)" == "MSC" && "$(CCNUMVER)" <= "001399999999"
- $(ASSEMBLY_ATTRIBUTES) : assembly.cs makefile.mk $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk
- $(GNUCOPY) -p assembly.cs $@
- echo \
---
-1.7.0.1
-