applied_patches/0312-build-mono-link.diff

   1 --- cli_ure/source/basetypes/makefile.mk.old    2009-04-06 16:41:58.000000000 +0000
   2 +++ cli_ure/source/basetypes/makefile.mk        2009-04-06 16:41:58.000000000 +0000
   3 @@ -102,7 +102,7 @@ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_ba
   4         $(WRAPCMD) $(AL) -out:$@ \
   5                         -version:$(CLI_BASETYPES_POLICY_VERSION) \
   6                         -keyfile:$(BIN)$/cliuno.snk \
   7 -                       -link:$(BIN)$/cli_basetypes.config
   8 +                       -link:cli_basetypes.config,$(BIN)$/cli_basetypes.config
   9
  10
  11  #Create the config file that is used with the policy assembly
  12 --- cli_ure/source/native/makefile.mk.old       2009-04-06 16:41:58.000000000 +0000
  13 +++ cli_ure/source/native/makefile.mk   2009-04-06 16:41:58.000000000 +0000
  14 @@ -174,7 +174,7 @@ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cp
  15         $(WRAPCMD) $(AL) -out:$@ \
  16                         -version:$(CLI_CPPUHELPER_POLICY_VERSION) \
  17                         -keyfile:$(BIN)$/cliuno.snk \
  18 -                       -link:$(BIN)$/cli_cppuhelper.config \
  19 +                       -link:cli_cppuhelper.config,$(BIN)$/cli_cppuhelper.config \
  20                         -platform:x86
  21  .ELSE
  22  #.NET 1.1: platform flag not needed
  23 @@ -182,7 +182,7 @@ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cp
  24         $(WRAPCMD) $(AL) -out:$@ \
  25                         -version:$(CLI_CPPUHELPER_POLICY_VERSION) \
  26                         -keyfile:$(BIN)$/cliuno.snk \
  27 -                       -link:$(BIN)$/cli_cppuhelper.config
  28 +                       -link:cli_cppuhelper.config,$(BIN)$/cli_cppuhelper.config
  29  .ENDIF
  30
  31  #Create the config file that is used with the policy assembly
  32 --- cli_ure/source/ure/makefile.mk.old  2009-04-06 16:41:58.000000000 +0000
  33 +++ cli_ure/source/ure/makefile.mk      2009-04-06 16:41:58.000000000 +0000
  34 @@ -101,7 +101,7 @@ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_ur
  35         $(WRAPCMD) $(AL) -out:$@ \
  36                         -version:$(CLI_URE_POLICY_VERSION) \
  37                         -keyfile:$(BIN)$/cliuno.snk \
  38 -                       -link:$(BIN)$/cli_ure.config
  39 +                       -link:cli_ure.config,$(BIN)$/cli_ure.config
  40
  41  #Create the config file that is used with the policy assembly
  42  $(BIN)$/cli_ure.config: cli_ure_config $(BIN)$/cliureversion.mk
  43 --- cli_ure/unotypes/makefile.mk.old    2009-04-02 10:49:20.000000000 +0000
  44 +++ cli_ure/unotypes/makefile.mk        2009-04-06 16:41:58.000000000 +0000
  45 @@ -72,7 +72,7 @@ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_ur
  46         $(WRAPCMD) AL.exe -out:$@ \
  47                         -version:$(CLI_URETYPES_POLICY_VERSION) \
  48                         -keyfile:$(BIN)$/cliuno.snk \
  49 -                       -link:$(BIN)$/cli_uretypes.config
  50 +                       -link:cli_uretypes.config,$(BIN)$/cli_uretypes.config
  51
  52  #Create the config file that is used with the policy assembly
  53  $(BIN)$/cli_uretypes.config: cli_uretypes_config $(BIN)$/cliureversion.mk