From 7f732b5b3c2593bfbbbb0e78a52add685cd283b2 Mon Sep 17 00:00:00 2001 From: Minto van der Sluis Date: Thu, 6 Sep 2007 13:54:38 +0200 Subject: [PATCH] Updated mono (1.2.2.1 -> 1.2.5) - Unfortunately using boehm-gc had to be disable since it results in a failing build. --- develop/mono/gcc34-powerpc.patch | 7 ++++--- develop/mono/mono.cache | 11 ++++------- develop/mono/mono.conf | 19 +++++++++++++------ develop/mono/mono.desc | 7 +++---- develop/mono/parse-config | 14 ++++++++++++++ 5 files changed, 38 insertions(+), 20 deletions(-) diff --git a/develop/mono/gcc34-powerpc.patch b/develop/mono/gcc34-powerpc.patch index 84f1d67e3..582c20c11 100644 --- a/develop/mono/gcc34-powerpc.patch +++ b/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. # -# 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 # # 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 # Foundation; either version 2 of the License, or (at your option) any later # version. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- The usual conclifts catched by gcc >= 3.4.x. diff --git a/develop/mono/mono.cache b/develop/mono/mono.cache index 2c97f7c49..c00c1f94a 100644 --- a/develop/mono/mono.cache +++ b/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] attr [DEP] bash [DEP] binutils [DEP] bison -[DEP] boehm-gc [DEP] bzip2 -[DEP] xorg-cf-files [DEP] coreutils [DEP] diffutils [DEP] findutils @@ -25,7 +22,6 @@ [DEP] make [DEP] mktemp [DEP] ncurses -[DEP] net-tools [DEP] patch [DEP] pkgconfig [DEP] sed @@ -33,4 +29,5 @@ [DEP] tar [DEP] util-linux [DEP] valgrind +[DEP] xorg-cf-files [DEP] zlib diff --git a/develop/mono/mono.conf b/develop/mono/mono.conf index b39dada7b..f41e7913f 100644 --- a/develop/mono/mono.conf +++ b/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. # -# 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) 1998 - 2003 Clifford Wolf # @@ -11,23 +12,29 @@ # 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. -# --- 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() { # this would otherwise break the configure script because # of "warning: -lpthread not used since linking not done" # 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 ' ' "-lpthread" } 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 var_append extraconfopt ' ' '--with-gc=included' fi +var_append extraconfopt ' ' '--disable-dependency-tracking' +var_append extraconfopt ' ' '--with-tls=pthread' var_append extraconfopt ' ' '--with-preview=yes' fix_pkgconfig() { diff --git a/develop/mono/mono.desc b/develop/mono/mono.desc index 5f9b02ae5..d09a982a4 100644 --- a/develop/mono/mono.desc +++ b/develop/mono/mono.desc @@ -1,9 +1,8 @@ - [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN --- [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [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) 1998 - 2003 Clifford Wolf [COPY] @@ -36,9 +35,9 @@ [L] GPL [S] Stable -[V] 1.2.2.1 +[V] 1.2.5 [P] X -----5---9 132.400 [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/ diff --git a/develop/mono/parse-config b/develop/mono/parse-config index 7c7dba3de..9b6a47a9e 100644 --- a/develop/mono/parse-config +++ b/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 [ "$pkg" == "mono" ]; then prefix="opt/mono"