From 83e0c35873b9f745296b992e9bacd1926c58080c Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Thu, 13 Dec 2007 13:46:49 +0000 Subject: mono 1.2.6: update recipies from 1.2.6pre4 to 1.2.6 --- .../mono/mono-1.2.5.1+1.2.6pre4/.mtn2git_empty | 0 .../mono/mono-1.2.5.1+1.2.6pre4/configure.patch | 23 ------- packages/mono/mono-1.2.6/.mtn2git_empty | 0 packages/mono/mono-1.2.6/configure.patch | 23 +++++++ .../mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb | 12 ---- packages/mono/mono-mcs-intermediate_1.2.6.bb | 10 +++ packages/mono/mono_1.2.5.1+1.2.6pre4.bb | 80 ---------------------- packages/mono/mono_1.2.6.bb | 78 +++++++++++++++++++++ packages/mono/mono_1.2.6.inc | 2 +- 9 files changed, 112 insertions(+), 116 deletions(-) delete mode 100644 packages/mono/mono-1.2.5.1+1.2.6pre4/.mtn2git_empty delete mode 100644 packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch create mode 100644 packages/mono/mono-1.2.6/.mtn2git_empty create mode 100644 packages/mono/mono-1.2.6/configure.patch delete mode 100644 packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb create mode 100644 packages/mono/mono-mcs-intermediate_1.2.6.bb delete mode 100644 packages/mono/mono_1.2.5.1+1.2.6pre4.bb create mode 100644 packages/mono/mono_1.2.6.bb (limited to 'packages/mono') diff --git a/packages/mono/mono-1.2.5.1+1.2.6pre4/.mtn2git_empty b/packages/mono/mono-1.2.5.1+1.2.6pre4/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch b/packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch deleted file mode 100644 index f033248621..0000000000 --- a/packages/mono/mono-1.2.5.1+1.2.6pre4/configure.patch +++ /dev/null @@ -1,23 +0,0 @@ -Index: mono-1.2.6/configure.in -=================================================================== ---- mono-1.2.6.orig/configure.in 2007-11-08 17:07:57.000000000 -0500 -+++ mono-1.2.6/configure.in 2007-12-12 15:27:52.000000000 -0500 -@@ -1150,6 +1150,8 @@ - ], [ - AC_MSG_RESULT(no) - with_tls=pthread -+ ], [ -+ AC_MSG_RESULT(yes) - ]) - fi - -@@ -1252,6 +1254,9 @@ - ], [ - with_sigaltstack=no - AC_MSG_RESULT(no) -+ ], [ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_WORKING_SIGALTSTACK) - ]) - fi - diff --git a/packages/mono/mono-1.2.6/.mtn2git_empty b/packages/mono/mono-1.2.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mono/mono-1.2.6/configure.patch b/packages/mono/mono-1.2.6/configure.patch new file mode 100644 index 0000000000..f033248621 --- /dev/null +++ b/packages/mono/mono-1.2.6/configure.patch @@ -0,0 +1,23 @@ +Index: mono-1.2.6/configure.in +=================================================================== +--- mono-1.2.6.orig/configure.in 2007-11-08 17:07:57.000000000 -0500 ++++ mono-1.2.6/configure.in 2007-12-12 15:27:52.000000000 -0500 +@@ -1150,6 +1150,8 @@ + ], [ + AC_MSG_RESULT(no) + with_tls=pthread ++ ], [ ++ AC_MSG_RESULT(yes) + ]) + fi + +@@ -1252,6 +1254,9 @@ + ], [ + with_sigaltstack=no + AC_MSG_RESULT(no) ++ ], [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_WORKING_SIGALTSTACK) + ]) + fi + diff --git a/packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb b/packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb deleted file mode 100644 index 1ec7397e2b..0000000000 --- a/packages/mono/mono-mcs-intermediate_1.2.5.1+1.2.6pre4.bb +++ /dev/null @@ -1,12 +0,0 @@ -# This is a straw-man recipe for step 1 in the two-step build of -# mono. Because it's impossible to build the mcs directory -# in cross-compile mode, this recipe will do a native build, -# then tar the resulting install tree for usage by the mono -# package in step 2. -# See http://www.mono-project.com/Mono:ARM - -require mono_1.2.6.inc -require mono-mcs-intermediate.inc - -DEFAULT_PREFERENCE = "-1" - diff --git a/packages/mono/mono-mcs-intermediate_1.2.6.bb b/packages/mono/mono-mcs-intermediate_1.2.6.bb new file mode 100644 index 0000000000..53ff1b25aa --- /dev/null +++ b/packages/mono/mono-mcs-intermediate_1.2.6.bb @@ -0,0 +1,10 @@ +# This is a straw-man recipe for step 1 in the two-step build of +# mono. Because it's impossible to build the mcs directory +# in cross-compile mode, this recipe will do a native build, +# then tar the resulting install tree for usage by the mono +# package in step 2. +# See http://www.mono-project.com/Mono:ARM + +require mono_1.2.6.inc +require mono-mcs-intermediate.inc + diff --git a/packages/mono/mono_1.2.5.1+1.2.6pre4.bb b/packages/mono/mono_1.2.5.1+1.2.6pre4.bb deleted file mode 100644 index e78160ee5a..0000000000 --- a/packages/mono/mono_1.2.5.1+1.2.6pre4.bb +++ /dev/null @@ -1,80 +0,0 @@ -require mono_1.2.6.inc - -DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native" - -PR = "r0" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI += "file://configure.patch;patch=1" - -# Per http://www.mono-project.com/Mono:ARM -EXTRA_OECONF += " --disable-mcs-build " -# Instead, get the mcs tree from a different build (see mono-mcs-intermediate) - -do_install_prepend() { - install -d ${D} - pushd ${D} - tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz - popd -} - -do_install_append() { - # mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#), - # however, jay is not being cross-compiled and thus only - # available for the buildhost architecture, so remove it - # entirely - pushd ${D} - rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \ - ./usr/share/jay/README.jay \ - ./usr/bin/jay - popd - - # Not packaged with the default rules and apparently - # not used for anything - rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml -} - -inherit mono - -# Import file definitions from Debian -require mono_1.2.5.1-files.inc - -# Add some packages -PACKAGES_append = " mono-doc mono mono-runtime" - -FILES_mono-doc_append = " /usr/share/libgc-mono/ " - -FILES_mono = "" -ALLOW_EMPTY_mono = "1" -RDEPENDS_mono = "mono-common mono-jit" - -FILES_mono-runtime = "" -ALLOW_EMPTY_mono-runtime = "1" -RDEPENDS_mono-runtime = "mono-jit mono-gac" - -RDEPENDS_mono-jit = "mono-common" - -FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \ - /usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la" -FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \ - /usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so" - -# Packages not included in Debian -PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \ - libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \ - libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil" - -FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll" -FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc" -FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb" - -FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*" -FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb" - -FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll" -FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb" - -# Move .pc files -FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc" -PACKAGES =+ " libmono-cairo1.0-cil-dev " diff --git a/packages/mono/mono_1.2.6.bb b/packages/mono/mono_1.2.6.bb new file mode 100644 index 0000000000..5c5d8476bb --- /dev/null +++ b/packages/mono/mono_1.2.6.bb @@ -0,0 +1,78 @@ +require mono_1.2.6.inc + +DEPENDS = "mono-native mono-mcs-intermediate glib-2.0 perl-native" + +PR = "r1" + +SRC_URI += "file://configure.patch;patch=1" + +# Per http://www.mono-project.com/Mono:ARM +EXTRA_OECONF += " --disable-mcs-build " +# Instead, get the mcs tree from a different build (see mono-mcs-intermediate) + +do_install_prepend() { + install -d ${D} + pushd ${D} + tar -xzf ${STAGING_DIR}/share/mono-mcs/mono-mcs-${PV}.tar.gz + popd +} + +do_install_append() { + # mono-mcs-intermediate builds and installs jay (a Yacc for Java and C#), + # however, jay is not being cross-compiled and thus only + # available for the buildhost architecture, so remove it + # entirely + pushd ${D} + rm -rf ./usr/share/man/man1/jay.1 ./usr/share/jay \ + ./usr/share/jay/README.jay \ + ./usr/bin/jay + popd + + # Not packaged with the default rules and apparently + # not used for anything + rm -rf ${D}${datadir}/mono-1.0/mono/cil/cil-opcodes.xml +} + +inherit mono + +# Import file definitions from Debian +require mono_1.2.5.1-files.inc + +# Add some packages +PACKAGES_append = " mono-doc mono mono-runtime" + +FILES_mono-doc_append = " /usr/share/libgc-mono/ " + +FILES_mono = "" +ALLOW_EMPTY_mono = "1" +RDEPENDS_mono = "mono-common mono-jit" + +FILES_mono-runtime = "" +ALLOW_EMPTY_mono-runtime = "1" +RDEPENDS_mono-runtime = "mono-jit mono-gac" + +RDEPENDS_mono-jit = "mono-common" + +FILES_libmono-dev =+ " /usr/lib/libmono.la /usr/lib/libmono-profiler-cov.la /usr/lib/libmono-profiler-aot.la \ + /usr/lib/libMonoPosixHelper.la /usr/lib/libMonoSupportW.la" +FILES_libmono-dbg =+ " /usr/lib/.debug/libmono*.so.* /usr/lib/.debug/libikvm-native.so \ + /usr/lib/.debug/libMonoPosixHelper.so /usr/lib/.debug/libMonoSupportW.so" + +# Packages not included in Debian +PACKAGES_prepend = "libnunit2.2-cil-dbg libnunit2.2-cil-dev libnunit2.2-cil \ + libmono-cecil0.5-cil-dbg libmono-cecil0.5-cil-dev libmono-cecil0.5-cil \ + libmono-db2-1.0-cil-dbg libmono-db2-1.0-cil-dev libmono-db2-1.0-cil" + +FILES_libnunit2.2-cil = "/usr/lib/mono/gac/nunit.*/2.2.* /usr/lib/mono/1.0/nunit.*.dll" +FILES_libnunit2.2-cil-dev = "/usr/lib/pkgconfig/mono-nunit.pc" +FILES_libnunit2.2-cil-dbg = "/usr/lib/mono/gac/nunit*/2.2.*/nunit.*.dll.mdb" + +FILES_libmono-cecil0.5-cil = "/usr/lib/mono/gac/Mono.Cecil/0.5.*" +FILES_libmono-cecil0.5-cil-dbg = "/usr/lib/mono/gac/Mono.Cecil/0.5.0.1__0738eb9f132ed756/Mono.Cecil.dll.mdb" + +FILES_libmono-db2-1.0-cil = "/usr/lib/mono/gac/IBM.Data.DB2/1.0* /usr/lib/mono/1.0/IBM.Data.DB2.dll" +FILES_libmono-db2-1.0-cil-dbg = "/usr/lib/mono/gac/IBM.Data.DB2/1.0*/IBM.Data.DB2.dll.mdb" + +# Move .pc files +FILES_libmono-cairo1.0-cil-dev = "/usr/lib/pkgconfig/mono-cairo.pc" +PACKAGES =+ " libmono-cairo1.0-cil-dev " diff --git a/packages/mono/mono_1.2.6.inc b/packages/mono/mono_1.2.6.inc index 23492e82f7..c9644cbce5 100644 --- a/packages/mono/mono_1.2.6.inc +++ b/packages/mono/mono_1.2.6.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Mono Programming Language" SECTION = "devel/mono" LICENSE = "GPL LGPL X11" -SRC_URI = "http://mono.ximian.com/monobuild/preview/sources/mono/mono-1.2.6.tar.bz2 \ +SRC_URI = "http://go-mono.com/sources/mono/mono-1.2.6.tar.bz2 \ file://mono-libgc-configure.patch;patch=1" S = "${WORKDIR}/mono-1.2.6" -- cgit v1.2.3