Browse Source

Updated mono (1.2.2.1 -> 1.2.5)

- Unfortunately using boehm-gc had to be disable since it results in a
  failing build.
early
Minto van der Sluis 17 years ago
parent
commit
7f732b5b3c
5 changed files with 38 additions and 20 deletions
  1. +4
    -3
      develop/mono/gcc34-powerpc.patch
  2. +4
    -7
      develop/mono/mono.cache
  3. +13
    -6
      develop/mono/mono.conf
  4. +3
    -4
      develop/mono/mono.desc
  5. +14
    -0
      develop/mono/parse-config

+ 4
- 3
develop/mono/gcc34-powerpc.patch

@ -1,7 +1,8 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# T2 SDE: package/.../mono/gcc34-powerpc.patch
# Filename: package/.../mono/gcc34-powerpc.patch
# Copyright (C) 2007 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# #
# More information can be found in the files COPYING and README. # More information can be found in the files COPYING and README.
@ -12,7 +13,7 @@
# of the GNU General Public License as published by the Free Software # of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later # Foundation; either version 2 of the License, or (at your option) any later
# version. # version.
# --- T2-COPYRIGHT-NOTE-END ---
# --- SDE-COPYRIGHT-NOTE-END ---
The usual conclifts catched by gcc >= 3.4.x. The usual conclifts catched by gcc >= 3.4.x.

+ 4
- 7
develop/mono/mono.cache

@ -1,16 +1,13 @@
[TIMESTAMP] 1134002642 Thu Dec 8 01:44:02 2005
[BUILDTIME] 330 (9)
[SIZE] 60.69 MB, 682 files
[TIMESTAMP] 1189078224 Thu Sep 6 13:30:24 2007
[BUILDTIME] 105 (5) ERROR
[SIZE] 70.68 MB, 840 files
[DEP] 00-dirtree [DEP] 00-dirtree
[DEP] attr
[DEP] bash [DEP] bash
[DEP] binutils [DEP] binutils
[DEP] bison [DEP] bison
[DEP] boehm-gc
[DEP] bzip2 [DEP] bzip2
[DEP] xorg-cf-files
[DEP] coreutils [DEP] coreutils
[DEP] diffutils [DEP] diffutils
[DEP] findutils [DEP] findutils
@ -25,7 +22,6 @@
[DEP] make [DEP] make
[DEP] mktemp [DEP] mktemp
[DEP] ncurses [DEP] ncurses
[DEP] net-tools
[DEP] patch [DEP] patch
[DEP] pkgconfig [DEP] pkgconfig
[DEP] sed [DEP] sed
@ -33,4 +29,5 @@
[DEP] tar [DEP] tar
[DEP] util-linux [DEP] util-linux
[DEP] valgrind [DEP] valgrind
[DEP] xorg-cf-files
[DEP] zlib [DEP] zlib

+ 13
- 6
develop/mono/mono.conf

@ -1,7 +1,8 @@
# --- T2-COPYRIGHT-NOTE-BEGIN ---
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# #
# T2 SDE: package/.../mono/mono.conf
# Filename: package/.../mono/mono.conf
# Copyright (C) 2006 - 2007 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf # Copyright (C) 1998 - 2003 Clifford Wolf
# #
@ -11,23 +12,29 @@
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the # the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING. # GNU General Public License can be found in the file COPYING.
# --- T2-COPYRIGHT-NOTE-END ---
# --- SDE-COPYRIGHT-NOTE-END ---
# FIXME: using boehm-gc results in mono build failure. So switched
# of for now.
boehm_gc_pm() { boehm_gc_pm() {
# this would otherwise break the configure script because # this would otherwise break the configure script because
# of "warning: -lpthread not used since linking not done" # of "warning: -lpthread not used since linking not done"
# as some check expect a warning as test # as some check expect a warning as test
var_append GCC_WRAPPER_APPEND ' ' "-I$( pkgprefix includedir boehm-gc )"
var_append GCC_WRAPPER_APPEND ' ' "-L$( pkgprefix libdir boehm-gc )" var_append GCC_WRAPPER_APPEND ' ' "-L$( pkgprefix libdir boehm-gc )"
var_append GCC_WRAPPER_APPEND ' ' "-lpthread"
} }
if pkginstalled boehm-gc; then if pkginstalled boehm-gc; then
var_append extraconfopt ' ' '--with-gc=boehm'
hook_add premake 1 boehm_gc_pm
var_append extraconfopt ' ' '--with-gc=included'
# var_append extraconfopt ' ' '--with-gc=boehm'
# hook_add premake 1 boehm_gc_pm
else else
var_append extraconfopt ' ' '--with-gc=included' var_append extraconfopt ' ' '--with-gc=included'
fi fi
var_append extraconfopt ' ' '--disable-dependency-tracking'
var_append extraconfopt ' ' '--with-tls=pthread'
var_append extraconfopt ' ' '--with-preview=yes' var_append extraconfopt ' ' '--with-preview=yes'
fix_pkgconfig() { fix_pkgconfig() {

+ 3
- 4
develop/mono/mono.desc

@ -1,9 +1,8 @@
[COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY] [COPY]
[COPY] Filename: package/.../mono/mono.desc [COPY] Filename: package/.../mono/mono.desc
[COPY] Copyright (C) 2006 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
[COPY] [COPY]
@ -36,9 +35,9 @@
[L] GPL [L] GPL
[S] Stable [S] Stable
[V] 1.2.2.1
[V] 1.2.5
[P] X -----5---9 132.400 [P] X -----5---9 132.400
[CV-URL] http://go-mono.com/sources-stable/ [CV-URL] http://go-mono.com/sources-stable/
[D] 2807650985 mono-1.2.2.1.tar.gz http://go-mono.com/sources/mono/
[D] 2332534640 mono-1.2.5.tar.bz2 http://go-mono.com/sources/mono/

+ 14
- 0
develop/mono/parse-config

@ -1,3 +1,17 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../mono/parse-config
# Copyright (C) 2007 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; version 2 of the License. A copy of the
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
if hasflag MONO; then if hasflag MONO; then
if [ "$pkg" == "mono" ]; then if [ "$pkg" == "mono" ]; then
prefix="opt/mono" prefix="opt/mono"

Loading…
Cancel
Save