Unbreak by creating a new tarball with bootrapped patched .c files.

breakage reported by and ok landry@ (vala wouldn't build witout vala...)
This commit is contained in:
ajacoutot 2011-04-06 12:05:07 +00:00
parent 54de012f47
commit b16c353ce9
4 changed files with 12 additions and 48 deletions

View File

@ -1,10 +1,16 @@
# $OpenBSD: Makefile,v 1.35 2011/04/05 18:40:44 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.36 2011/04/06 12:05:07 ajacoutot Exp $
COMMENT= compiler for the GObject type system
GNOME_PROJECT= vala
GNOME_VERSION= 0.12.0
# XXX regened .c from patched .vala
DISTFILES= _${DISTNAME}.tar.gz
MASTER_SITES= http://distfiles.bsdfrog.org/
REVISION= 0
SHARED_LIBS += vala-0.12 0.0 # 0.0
CATEGORIES= lang

View File

@ -1,5 +1,5 @@
MD5 (vala-0.12.0.tar.bz2) = sR+vqnBQhTQhVjEuNWtv8g==
RMD160 (vala-0.12.0.tar.bz2) = TEih9tfElCRO2YzZJXsNlsc159E=
SHA1 (vala-0.12.0.tar.bz2) = N5mhzdpjtAt6oDG8p9pr8brwALE=
SHA256 (vala-0.12.0.tar.bz2) = mjmOFvuix4ybytsF5InJvDGONJAdQ0UaxdLOS8RrEiU=
SIZE (vala-0.12.0.tar.bz2) = 2852200
MD5 (_vala-0.12.0.tar.gz) = 38yQY3OpRhr52BVZbznohg==
RMD160 (_vala-0.12.0.tar.gz) = HCTpd5XXVbxCMV4nCo5DgFjS7+I=
SHA1 (_vala-0.12.0.tar.gz) = J7Al0ouB0u9Q0sre2lpyjON7H4w=
SHA256 (_vala-0.12.0.tar.gz) = v1BKsR78qTmbDkwkFhhmGX31IiLF0GVWrprbI2gShmE=
SIZE (_vala-0.12.0.tar.gz) = 4331602

View File

@ -1,23 +0,0 @@
$OpenBSD: patch-codegen_valaccodebasemodule_vala,v 1.1 2011/04/05 18:40:44 ajacoutot Exp $
From 5d29984bff7d5c2ac32372470b8de439a477ecd4 Mon Sep 17 00:00:00 2001
From: Jürg Billeter <j@bitron.ch>
Date: Tue, 05 Apr 2011 17:23:00 +0000
Subject: codegen: Fix initializer lists for structs with array fields
--- codegen/valaccodebasemodule.vala.orig Sat Apr 2 23:24:19 2011
+++ codegen/valaccodebasemodule.vala Tue Apr 5 19:36:06 2011
@@ -2134,6 +2134,13 @@ public abstract class Vala.CCodeBaseModule : CodeGener
}
clist.append (cexpr);
+
+ var array_type = field.variable_type as ArrayType;
+ if (array_type != null && !field.no_array_length && !field.array_null_terminated) {
+ for (int dim = 1; dim <= array_type.rank; dim++) {
+ clist.append (get_array_length_cvalue (expr.target_value, dim));
+ }
+ }
}
set_cvalue (list, clist);

View File

@ -1,19 +0,0 @@
$OpenBSD: patch-vala_valamemberaccess_vala,v 1.1 2011/04/05 18:40:44 ajacoutot Exp $
From 5d74330d6c660ec7bc6caa6b3c23921b93358204 Mon Sep 17 00:00:00 2001
From: Jürg Billeter <j@bitron.ch>
Date: Tue, 05 Apr 2011 17:28:31 +0000
Subject: Allow access to length of constant array in constant initializer lists
--- vala/valamemberaccess.vala.orig Sun Mar 27 19:47:24 2011
+++ vala/valamemberaccess.vala Tue Apr 5 19:36:28 2011
@@ -169,6 +169,9 @@ public class Vala.MemberAccess : Expression {
var method = symbol_reference as Method;
if (symbol_reference is Constant) {
return true;
+ } else if (symbol_reference is ArrayLengthField && inner != null && inner.symbol_reference is Constant) {
+ // length of constant array
+ return true;
} else if (method != null &&
(method.binding == MemberBinding.STATIC || prototype_access)) {
return true;