From cab401ad53a4fca1328583f1ba6860f4180ea900 Mon Sep 17 00:00:00 2001 From: Cliff Brake Date: Mon, 3 Sep 2007 20:30:34 +0000 Subject: mono 1.2.5: add 1.2.4, drop 1.2.5-pre5 --- packages/mono/mono-1.2.4+1.2.5pre5/.mtn2git_empty | 0 packages/mono/mono-1.2.4+1.2.5pre5/configure.patch | 67 ---------------------- packages/mono/mono-1.2.5/.mtn2git_empty | 0 packages/mono/mono-1.2.5/configure.patch | 67 ++++++++++++++++++++++ packages/mono/mono-native_1.2.5.bb | 10 ++++ packages/mono/mono-native_1.2.5pre5.bb | 10 ---- packages/mono/mono_1.2.5.bb | 23 ++++++++ packages/mono/mono_1.2.5.inc | 16 ++++++ packages/mono/mono_1.2.5pre5.bb | 23 -------- packages/mono/mono_1.2.5pre5.inc | 18 ------ 10 files changed, 116 insertions(+), 118 deletions(-) delete mode 100644 packages/mono/mono-1.2.4+1.2.5pre5/.mtn2git_empty delete mode 100644 packages/mono/mono-1.2.4+1.2.5pre5/configure.patch create mode 100644 packages/mono/mono-1.2.5/.mtn2git_empty create mode 100644 packages/mono/mono-1.2.5/configure.patch create mode 100644 packages/mono/mono-native_1.2.5.bb delete mode 100644 packages/mono/mono-native_1.2.5pre5.bb create mode 100644 packages/mono/mono_1.2.5.bb create mode 100644 packages/mono/mono_1.2.5.inc delete mode 100644 packages/mono/mono_1.2.5pre5.bb delete mode 100644 packages/mono/mono_1.2.5pre5.inc (limited to 'packages') diff --git a/packages/mono/mono-1.2.4+1.2.5pre5/.mtn2git_empty b/packages/mono/mono-1.2.4+1.2.5pre5/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mono/mono-1.2.4+1.2.5pre5/configure.patch b/packages/mono/mono-1.2.4+1.2.5pre5/configure.patch deleted file mode 100644 index 1553115c0e..0000000000 --- a/packages/mono/mono-1.2.4+1.2.5pre5/configure.patch +++ /dev/null @@ -1,67 +0,0 @@ -Index: mono-1.2.5/configure.in -=================================================================== ---- mono-1.2.5.orig/configure.in -+++ mono-1.2.5/configure.in -@@ -1134,6 +1134,8 @@ if test x$platform_win32 = xno; then - ], [ - AC_MSG_RESULT(no) - with_tls=pthread -+ ], [ -+ AC_MSG_RESULT(yes) - ]) - fi - -@@ -1236,6 +1238,9 @@ if test x$platform_win32 = xno; then - ], [ - with_sigaltstack=no - AC_MSG_RESULT(no) -+ ], [ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_WORKING_SIGALTSTACK) - ]) - fi - -@@ -1893,24 +1898,26 @@ if test "x$with_tls" = "x__thread"; then - ]) - fi - --if test ${TARGET} = ARM; then -- dnl ****************************************** -- dnl *** Check to see what FPU is available *** -- dnl ****************************************** -- AC_MSG_CHECKING(which FPU to use) -- -- AC_TRY_COMPILE([], [ -- __asm__ ("ldfd f0, [r0]"); -- ], fpu=FPA, [ -- AC_TRY_COMPILE([], [ -- __asm__ ("fldd d0, [r0]"); -- ], fpu=VFP, fpu=NONE) -- ]) -+#if test ${TARGET} = ARM; then -+# dnl ****************************************** -+# dnl *** Check to see what FPU is available *** -+# dnl ****************************************** -+# AC_MSG_CHECKING(which FPU to use) -+# -+# AC_TRY_COMPILE([], [ -+# __asm__ ("ldfd f0, [r0]"); -+# ], fpu=FPA, [ -+# AC_TRY_COMPILE([], [ -+# __asm__ ("fldd d0, [r0]"); -+# ], fpu=VFP, fpu=NONE) -+# ]) -+# -+# AC_MSG_RESULT($fpu) -+# CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1" -+# unset fpu -+#fi - -- AC_MSG_RESULT($fpu) -- CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1" -- unset fpu --fi -+ CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1" - - if test ${TARGET} = unknown; then - CPPFLAGS="$CPPFLAGS -DNO_PORT" diff --git a/packages/mono/mono-1.2.5/.mtn2git_empty b/packages/mono/mono-1.2.5/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mono/mono-1.2.5/configure.patch b/packages/mono/mono-1.2.5/configure.patch new file mode 100644 index 0000000000..1553115c0e --- /dev/null +++ b/packages/mono/mono-1.2.5/configure.patch @@ -0,0 +1,67 @@ +Index: mono-1.2.5/configure.in +=================================================================== +--- mono-1.2.5.orig/configure.in ++++ mono-1.2.5/configure.in +@@ -1134,6 +1134,8 @@ if test x$platform_win32 = xno; then + ], [ + AC_MSG_RESULT(no) + with_tls=pthread ++ ], [ ++ AC_MSG_RESULT(yes) + ]) + fi + +@@ -1236,6 +1238,9 @@ if test x$platform_win32 = xno; then + ], [ + with_sigaltstack=no + AC_MSG_RESULT(no) ++ ], [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_WORKING_SIGALTSTACK) + ]) + fi + +@@ -1893,24 +1898,26 @@ if test "x$with_tls" = "x__thread"; then + ]) + fi + +-if test ${TARGET} = ARM; then +- dnl ****************************************** +- dnl *** Check to see what FPU is available *** +- dnl ****************************************** +- AC_MSG_CHECKING(which FPU to use) +- +- AC_TRY_COMPILE([], [ +- __asm__ ("ldfd f0, [r0]"); +- ], fpu=FPA, [ +- AC_TRY_COMPILE([], [ +- __asm__ ("fldd d0, [r0]"); +- ], fpu=VFP, fpu=NONE) +- ]) ++#if test ${TARGET} = ARM; then ++# dnl ****************************************** ++# dnl *** Check to see what FPU is available *** ++# dnl ****************************************** ++# AC_MSG_CHECKING(which FPU to use) ++# ++# AC_TRY_COMPILE([], [ ++# __asm__ ("ldfd f0, [r0]"); ++# ], fpu=FPA, [ ++# AC_TRY_COMPILE([], [ ++# __asm__ ("fldd d0, [r0]"); ++# ], fpu=VFP, fpu=NONE) ++# ]) ++# ++# AC_MSG_RESULT($fpu) ++# CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1" ++# unset fpu ++#fi + +- AC_MSG_RESULT($fpu) +- CPPFLAGS="$CPPFLAGS -DARM_FPU_$fpu=1" +- unset fpu +-fi ++ CPPFLAGS="$CPPFLAGS -DARM_FPU_NONE=1" + + if test ${TARGET} = unknown; then + CPPFLAGS="$CPPFLAGS -DNO_PORT" diff --git a/packages/mono/mono-native_1.2.5.bb b/packages/mono/mono-native_1.2.5.bb new file mode 100644 index 0000000000..0f1391cd25 --- /dev/null +++ b/packages/mono/mono-native_1.2.5.bb @@ -0,0 +1,10 @@ +require mono_1.2.5.inc +PR = "r2" +DEPENDS = "glib-2.0-native" + +inherit native + +#do_stage_prepend() { +# install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR} +#} + diff --git a/packages/mono/mono-native_1.2.5pre5.bb b/packages/mono/mono-native_1.2.5pre5.bb deleted file mode 100644 index 4664cf8310..0000000000 --- a/packages/mono/mono-native_1.2.5pre5.bb +++ /dev/null @@ -1,10 +0,0 @@ -require mono_1.2.5pre5.inc -PR = "r2" -DEPENDS = "glib-2.0-native" - -inherit native - -#do_stage_prepend() { -# install -m 755 ${S}/mono/monoburg/monoburg ${STAGING_BINDIR} -#} - diff --git a/packages/mono/mono_1.2.5.bb b/packages/mono/mono_1.2.5.bb new file mode 100644 index 0000000000..c0a4cfb223 --- /dev/null +++ b/packages/mono/mono_1.2.5.bb @@ -0,0 +1,23 @@ +require mono_1.2.5.inc + +#DEPENDS = "mono-native glib-2.0" +# for now, we skip the mono-native build -- just install +# mono using your distro package manager for now +# after we get the target version working, we'll worry +# about the native package for systems that don't have mono +# installed +DEPENDS = "glib-2.0" + +PR = "r0" + +SRC_URI += "file://configure.patch;patch=1" + +do_install_append() { + install -d ${D}${libdir}/mono/1.0/ + cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/ +} + +PACKAGES =+ "mono-dll" +FILES_mono-dll = "${libdir}/mono/1.0/" + + diff --git a/packages/mono/mono_1.2.5.inc b/packages/mono/mono_1.2.5.inc new file mode 100644 index 0000000000..0e0df1caf2 --- /dev/null +++ b/packages/mono/mono_1.2.5.inc @@ -0,0 +1,16 @@ +DESCRIPTION = "Mono Programming Language" +SECTION = "devel/mono" +LICENSE = "GPL LGPL X11" + +# the md5 sum check is required because Novell does not version their pre release versions of mono +# if the md5sum check fails, contact cbrake on #oe +# checksums are stored in conf/checksums.ini +SRC_URI = "http://go-mono.com/sources/mono/mono-1.2.5.tar.bz2" + +S = "${WORKDIR}/mono-1.2.5" + +inherit autotools +EXTRA_OECONF = "--disable-mcs-build" +EXTRA_OECONF_arm = "--without-tls" +EXTRA_OECONF_mipsel = "--without-tls" + diff --git a/packages/mono/mono_1.2.5pre5.bb b/packages/mono/mono_1.2.5pre5.bb deleted file mode 100644 index 3ba24e9a5a..0000000000 --- a/packages/mono/mono_1.2.5pre5.bb +++ /dev/null @@ -1,23 +0,0 @@ -require mono_1.2.5pre5.inc - -#DEPENDS = "mono-native glib-2.0" -# for now, we skip the mono-native build -- just install -# mono using your distro package manager for now -# after we get the target version working, we'll worry -# about the native package for systems that don't have mono -# installed -DEPENDS = "glib-2.0" - -PR = "r3" - -SRC_URI += "file://configure.patch;patch=1" - -do_install_append() { - install -d ${D}${libdir}/mono/1.0/ - cp ${S}/mcs/class/lib/monolite/* ${D}${libdir}/mono/1.0/ -} - -PACKAGES =+ "mono-dll" -FILES_mono-dll = "${libdir}/mono/1.0/" - - diff --git a/packages/mono/mono_1.2.5pre5.inc b/packages/mono/mono_1.2.5pre5.inc deleted file mode 100644 index 802e64156a..0000000000 --- a/packages/mono/mono_1.2.5pre5.inc +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Mono Programming Language" -SECTION = "devel/mono" -LICENSE = "GPL LGPL X11" - -PV = "1.2.4+1.2.5pre5" - -# the md5 sum check is required because Novell does not version their pre release versions of mono -# if the md5sum check fails, contact cbrake on #oe -# checksums are stored in conf/checksums.ini -SRC_URI = "http://mono.ximian.com/monobuild/preview/sources/mono/mono-1.2.5.tar.bz2" - -S = "${WORKDIR}/mono-1.2.5" - -inherit autotools -EXTRA_OECONF = "--disable-mcs-build" -EXTRA_OECONF_arm = "--without-tls" -EXTRA_OECONF_mipsel = "--without-tls" - -- cgit v1.2.3