rpms/mono
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
55121410d3
mono/mono-2.8-metadata-makefile.patch

41 lines
2.2 KiB
Diff
Raw Normal View History

Bump to 2.8 release Remove .NET 1.1 code Update ppc threading patch Update patch1 and 5 and rename Combine patches 2 and 7 (why two libdir patches?) Remove jay from the install step Realise that spelling is quite imporgtint... Big changes to the spec file to bring it into line with Novell's fixes New mvc, mvc-devel and winfx subpackages Some parts of the mono-web subpackage moved to mvc Fix the macro which looked for 1.0 things Remove and obsoletes mono-jscript Remove and obsolete data-sybase and data-firebird Modify macros to make sense now the 1.0 stuff has gone Extend the 4.0 subpackage to include lots of new stuff
2010-10-12 23:56:13 +00:00
--- mono-2.8/mono/metadata/Makefile.am 2010-09-10 21:55:45.000000000 +0100
+++ mono-2.8/mono/metadata/Makefile-new.am 2010-09-15 13:47:56.378549804 +0100
Bump to latest and greatest preview Various patch fixes Massive number of bug fixes to mono
2009-10-04 15:17:20 +00:00
@@ -20,7 +20,7 @@
AM_CFLAGS = -O
else
-assembliesdir = $(exec_prefix)/lib
Bump to 2.8 release Remove .NET 1.1 code Update ppc threading patch Update patch1 and 5 and rename Combine patches 2 and 7 (why two libdir patches?) Remove jay from the install step Realise that spelling is quite imporgtint... Big changes to the spec file to bring it into line with Novell's fixes New mvc, mvc-devel and winfx subpackages Some parts of the mono-web subpackage moved to mvc Fix the macro which looked for 1.0 things Remove and obsoletes mono-jscript Remove and obsolete data-sybase and data-firebird Modify macros to make sense now the 1.0 stuff has gone Extend the 4.0 subpackage to include lots of new stuff
2010-10-12 23:56:13 +00:00
+assembliesdir = @LIBDIR@
Bump to latest and greatest preview Various patch fixes Massive number of bug fixes to mono
2009-10-04 15:17:20 +00:00
confdir = $(sysconfdir)
unix_sources = \
console-unix.c
Bump to 2.8 release Remove .NET 1.1 code Update ppc threading patch Update patch1 and 5 and rename Combine patches 2 and 7 (why two libdir patches?) Remove jay from the install step Realise that spelling is quite imporgtint... Big changes to the spec file to bring it into line with Novell's fixes New mvc, mvc-devel and winfx subpackages Some parts of the mono-web subpackage moved to mvc Fix the macro which looked for 1.0 things Remove and obsoletes mono-jscript Remove and obsolete data-sybase and data-firebird Modify macros to make sense now the 1.0 stuff has gone Extend the 4.0 subpackage to include lots of new stuff
2010-10-12 23:56:13 +00:00
@@ -40,7 +40,7 @@
noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la $(sgen_libraries)
Bump to latest and greatest preview Various patch fixes Massive number of bug fixes to mono
2009-10-04 15:17:20 +00:00
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\"
#
# Make sure any prefix changes are updated in the binaries too.
Bump to 2.8 release Remove .NET 1.1 code Update ppc threading patch Update patch1 and 5 and rename Combine patches 2 and 7 (why two libdir patches?) Remove jay from the install step Realise that spelling is quite imporgtint... Big changes to the spec file to bring it into line with Novell's fixes New mvc, mvc-devel and winfx subpackages Some parts of the mono-web subpackage moved to mvc Fix the macro which looked for 1.0 things Remove and obsoletes mono-jscript Remove and obsolete data-sybase and data-firebird Modify macros to make sense now the 1.0 stuff has gone Extend the 4.0 subpackage to include lots of new stuff
2010-10-12 23:56:13 +00:00
--- mono-2.8/mono/metadata/Makefile.in 2010-09-10 21:58:23.000000000 +0100
+++ mono-2.8/mono/metadata/Makefile-new.in 2010-09-15 13:51:58.500133920 +0100
@@ -713,7 +713,7 @@
Bump to latest and greatest preview Various patch fixes Massive number of bug fixes to mono
2009-10-04 15:17:20 +00:00
# The files that use MONO_ASSEMBLIES and/or MONO_CFG_DIR replace the
# / by \ if running under WIN32.
Bump to 2.8 release Remove .NET 1.1 code Update ppc threading patch Update patch1 and 5 and rename Combine patches 2 and 7 (why two libdir patches?) Remove jay from the install step Realise that spelling is quite imporgtint... Big changes to the spec file to bring it into line with Novell's fixes New mvc, mvc-devel and winfx subpackages Some parts of the mono-web subpackage moved to mvc Fix the macro which looked for 1.0 things Remove and obsoletes mono-jscript Remove and obsolete data-sybase and data-firebird Modify macros to make sense now the 1.0 stuff has gone Extend the 4.0 subpackage to include lots of new stuff
2010-10-12 23:56:13 +00:00
@CROSS_COMPILING_TRUE@@HOST_WIN32_TRUE@assembliesdir = ${libdir}
-@HOST_WIN32_FALSE@assembliesdir = $(exec_prefix)/lib
+@HOST_WIN32_FALSE@assembliesdir = @LIBDIR@
@CROSS_COMPILING_FALSE@@HOST_WIN32_TRUE@confdir = `cygpath -m "${sysconfdir}"`
@CROSS_COMPILING_TRUE@@HOST_WIN32_TRUE@confdir = ${sysconfdir}
@HOST_WIN32_FALSE@confdir = $(sysconfdir)
@@ -730,7 +730,7 @@
Bump to latest and greatest preview Various patch fixes Massive number of bug fixes to mono
2009-10-04 15:17:20 +00:00
#
Bump to 2.8 release Remove .NET 1.1 code Update ppc threading patch Update patch1 and 5 and rename Combine patches 2 and 7 (why two libdir patches?) Remove jay from the install step Realise that spelling is quite imporgtint... Big changes to the spec file to bring it into line with Novell's fixes New mvc, mvc-devel and winfx subpackages Some parts of the mono-web subpackage moved to mvc Fix the macro which looked for 1.0 things Remove and obsoletes mono-jscript Remove and obsolete data-sybase and data-firebird Modify macros to make sense now the 1.0 stuff has gone Extend the 4.0 subpackage to include lots of new stuff
2010-10-12 23:56:13 +00:00
@SUPPORT_SGEN_TRUE@sgen_libraries = libmonoruntimesgen.la libmonoruntimesgen-static.la
noinst_LTLIBRARIES = libmonoruntime.la libmonoruntime-static.la $(sgen_libraries)
Bump to latest and greatest preview Various patch fixes Massive number of bug fixes to mono
2009-10-04 15:17:20 +00:00
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\"
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CFLAGS) $(GLIB_CFLAGS) -DMONO_BINDIR=\"$(bindir)/\" -DMONO_ASSEMBLIES=\"$(assembliesdir)\" -DMONO_CFG_DIR=\"$(confdir)\" -DMONO_RELOC_LIBDIR=\"$(reloc_libdir)\"
CLEANFILES = mono-bundle.stamp
libmonoruntime_static_la_LIBADD = $(bundle_obj) $(libmonoruntime_la_LIBADD)
null_sources = \
Reference in New Issue Copy Permalink