[Lsb-messages] /var/www/bzr/lsb/devel/devchk r2315: various fixes from trying to resolve devchk build probs

Mats Wichmann mats at linuxfoundation.org
Mon Oct 29 17:20:50 UTC 2012


------------------------------------------------------------
revno: 2315
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: devchk
timestamp: Mon 2012-10-29 11:20:50 -0600
message:
  various fixes from trying to resolve devchk build probs
modified:
  ts/devchk/cflags.mk
  ts/devchk/ffi_h.c
  ts/devchk/glib_2_0_glib_gprintf_h.c
  ts/devchk/glib_2_0_glib_gprintf_h.inc
  ts/devchk/glib_2_0_glib_h.c
  ts/devchk/glib_2_0_glib_h.inc
-------------- next part --------------
=== modified file 'ts/devchk/cflags.mk'
--- a/ts/devchk/cflags.mk	2012-05-22 12:59:09 +0000
+++ b/ts/devchk/cflags.mk	2012-10-29 17:20:50 +0000
@@ -49,6 +49,8 @@
     -I/usr/include/gdk-pixbuf-2.0 \
     -I/usr/lib64/glib-2.0/include \
     -I/usr/lib/glib-2.0/include \
+    -I/usr/lib64/libffi-3.0.10/include \
+    -I/usr/lib/libffi-3.0.10/include \
     -I/usr/include/libxml2 \
     -I/usr/include/fontconfig \
     -I/usr/include/cairo \

=== modified file 'ts/devchk/ffi_h.c'
--- a/ts/devchk/ffi_h.c	2012-10-25 21:24:06 +0000
+++ b/ts/devchk/ffi_h.c	2012-10-29 17:20:50 +0000
@@ -63,12 +63,7 @@
 #endif
 
 #if 1
-CheckTypeSize(struct _ffi_type,0, 41188, 1, , NULL, 0, NULL)
-Msg("Missing member data for _ffi_type on All\n");
-CheckOffset(struct _ffi_type,size,0,1,223117)
-CheckOffset(struct _ffi_type,alignment,0,1,223118)
-CheckOffset(struct _ffi_type,type,0,1,223119)
-CheckOffset(struct _ffi_type,elements,0,1,223120)
+CheckTypeSize(_ffi_type,0, 41188, 1, 5.0, NULL, 41187, NULL)
 #endif
 
 #if 1
@@ -80,24 +75,11 @@
 #endif
 
 #if 1
-CheckTypeSize(struct ffi_cif,0, 41196, 1, 5.0, NULL, 0, NULL)
-Msg("Missing member data for ffi_cif on All\n");
-CheckOffset(struct ffi_cif,abi,0,1,223132)
-CheckOffset(struct ffi_cif,nargs,0,1,223133)
-CheckOffset(struct ffi_cif,arg_types,0,1,223134)
-CheckOffset(struct ffi_cif,rtype,0,1,223135)
-CheckOffset(struct ffi_cif,bytes,0,1,223136)
-CheckOffset(struct ffi_cif,flags,0,1,223137)
+CheckTypeSize(ffi_cif,0, 41196, 1, 5.0, NULL, 41195, NULL)
 #endif
 
 #if 1
-CheckTypeSize(union ffi_raw,0, 41198, 1, 5.0, NULL, 0, NULL)
-Msg("Missing member data for ffi_raw on All\n");
-CheckOffset(union ffi_raw,sint,0,1,223145)
-CheckOffset(union ffi_raw,uint,0,1,223146)
-CheckOffset(union ffi_raw,flt,0,1,223147)
-CheckOffset(union ffi_raw,data,0,1,223148)
-CheckOffset(union ffi_raw,ptr,0,1,223149)
+CheckTypeSize(ffi_raw,0, 41198, 1, 5.0, NULL, 41197, NULL)
 #endif
 
 #if 1
@@ -105,81 +87,62 @@
 #endif
 
 #if 1
-CheckTypeSize(struct ffi_closure,0, 41205, 1, 5.0, NULL, 0, NULL)
-Msg("Missing member data for ffi_closure on All\n");
-CheckOffset(struct ffi_closure,tramp,0,1,223160)
-CheckOffset(struct ffi_closure,cif,0,1,223161)
-CheckOffset(struct ffi_closure,fun,0,1,223162)
-CheckOffset(struct ffi_closure,user_data,0,1,223163)
-#endif
-
-#if 1
-CheckTypeSize(struct ffi_raw_closure,0, 41209, 1, 5.0, NULL, 0, NULL)
-Msg("Missing member data for ffi_raw_closure on All\n");
-CheckOffset(struct ffi_raw_closure,tramp,0,1,223176)
-CheckOffset(struct ffi_raw_closure,cif,0,1,223177)
-CheckOffset(struct ffi_raw_closure,translate_args,0,1,223178)
-CheckOffset(struct ffi_raw_closure,this_closure,0,1,223179)
-CheckOffset(struct ffi_raw_closure,fun,0,1,223180)
-CheckOffset(struct ffi_raw_closure,user_data,0,1,223181)
-#endif
-
-#if 1
-CheckTypeSize(struct ffi_java_raw_closure,0, 41212, 1, 5.0, NULL, 0, NULL)
-Msg("Missing member data for ffi_java_raw_closure on All\n");
-CheckOffset(struct ffi_java_raw_closure,tramp,0,1,223194)
-CheckOffset(struct ffi_java_raw_closure,cif,0,1,223195)
-CheckOffset(struct ffi_java_raw_closure,translate_args,0,1,223196)
-CheckOffset(struct ffi_java_raw_closure,this_closure,0,1,223197)
-CheckOffset(struct ffi_java_raw_closure,fun,0,1,223198)
-CheckOffset(struct ffi_java_raw_closure,user_data,0,1,223199)
-#endif
-
-extern void ffi_raw_call_db(struct ffi_cif *, void(*fptr0)(void)
-, void *, union ffi_raw *);
+CheckTypeSize(ffi_closure,0, 41205, 1, 5.0, NULL, 41204, NULL)
+#endif
+
+#if 1
+CheckTypeSize(ffi_raw_closure,0, 41209, 1, 5.0, NULL, 41208, NULL)
+#endif
+
+#if 1
+CheckTypeSize(ffi_java_raw_closure,0, 41212, 1, 5.0, NULL, 41211, NULL)
+#endif
+
+extern void ffi_raw_call_db(ffi_cif *, void(*fptr0)(void)
+, void *, ffi_raw *);
 CheckInterfacedef(ffi_raw_call,ffi_raw_call_db);
-extern void ffi_ptrarray_to_raw_db(struct ffi_cif *, void * *, union ffi_raw *);
+extern void ffi_ptrarray_to_raw_db(ffi_cif *, void * *, ffi_raw *);
 CheckInterfacedef(ffi_ptrarray_to_raw,ffi_ptrarray_to_raw_db);
-extern void ffi_raw_to_ptrarray_db(struct ffi_cif *, union ffi_raw *, void * *);
+extern void ffi_raw_to_ptrarray_db(ffi_cif *, ffi_raw *, void * *);
 CheckInterfacedef(ffi_raw_to_ptrarray,ffi_raw_to_ptrarray_db);
-extern size_t ffi_raw_size_db(struct ffi_cif *);
+extern size_t ffi_raw_size_db(ffi_cif *);
 CheckInterfacedef(ffi_raw_size,ffi_raw_size_db);
-extern void ffi_java_raw_call_db(struct ffi_cif *, void(*fptr1)(void)
+extern void ffi_java_raw_call_db(ffi_cif *, void(*fptr1)(void)
 , void *, ffi_java_raw *);
 CheckInterfacedef(ffi_java_raw_call,ffi_java_raw_call_db);
-extern void ffi_java_ptrarray_to_raw_db(struct ffi_cif *, void * *, ffi_java_raw *);
+extern void ffi_java_ptrarray_to_raw_db(ffi_cif *, void * *, ffi_java_raw *);
 CheckInterfacedef(ffi_java_ptrarray_to_raw,ffi_java_ptrarray_to_raw_db);
-extern void ffi_java_raw_to_ptrarray_db(struct ffi_cif *, ffi_java_raw *, void * *);
+extern void ffi_java_raw_to_ptrarray_db(ffi_cif *, ffi_java_raw *, void * *);
 CheckInterfacedef(ffi_java_raw_to_ptrarray,ffi_java_raw_to_ptrarray_db);
-extern size_t ffi_java_raw_size_db(struct ffi_cif *);
+extern size_t ffi_java_raw_size_db(ffi_cif *);
 CheckInterfacedef(ffi_java_raw_size,ffi_java_raw_size_db);
 extern void * ffi_closure_alloc_db(size_t, void * *);
 CheckInterfacedef(ffi_closure_alloc,ffi_closure_alloc_db);
 extern void ffi_closure_free_db(void *);
 CheckInterfacedef(ffi_closure_free,ffi_closure_free_db);
-extern ffi_status ffi_prep_closure_db(struct ffi_closure *, struct ffi_cif *, void(*fptr2)(struct ffi_cif *,void *,void * *,void *)
+extern ffi_status ffi_prep_closure_db(ffi_closure *, ffi_cif *, void(*fptr2)(ffi_cif *,void *,void * *,void *)
 , void *);
 CheckInterfacedef(ffi_prep_closure,ffi_prep_closure_db);
-extern ffi_status ffi_prep_closure_loc_db(struct ffi_closure *, struct ffi_cif *, void(*fptr3)(struct ffi_cif *,void *,void * *,void *)
+extern ffi_status ffi_prep_closure_loc_db(ffi_closure *, ffi_cif *, void(*fptr3)(ffi_cif *,void *,void * *,void *)
 , void *, void *);
 CheckInterfacedef(ffi_prep_closure_loc,ffi_prep_closure_loc_db);
-extern ffi_status ffi_prep_raw_closure_db(struct ffi_raw_closure *, struct ffi_cif *, void(*fptr4)(struct ffi_cif *,void *,union ffi_raw *,void *)
+extern ffi_status ffi_prep_raw_closure_db(ffi_raw_closure *, ffi_cif *, void(*fptr4)(ffi_cif *,void *,ffi_raw *,void *)
 , void *);
 CheckInterfacedef(ffi_prep_raw_closure,ffi_prep_raw_closure_db);
-extern ffi_status ffi_prep_raw_closure_loc_db(struct ffi_raw_closure *, struct ffi_cif *, void(*fptr5)(struct ffi_cif *,void *,union ffi_raw *,void *)
+extern ffi_status ffi_prep_raw_closure_loc_db(ffi_raw_closure *, ffi_cif *, void(*fptr5)(ffi_cif *,void *,ffi_raw *,void *)
 , void *, void *);
 CheckInterfacedef(ffi_prep_raw_closure_loc,ffi_prep_raw_closure_loc_db);
-extern ffi_status ffi_prep_java_raw_closure_db(struct ffi_java_raw_closure *, struct ffi_cif *, void(*fptr6)(struct ffi_cif *,void *,ffi_java_raw *,void *)
+extern ffi_status ffi_prep_java_raw_closure_db(ffi_java_raw_closure *, ffi_cif *, void(*fptr6)(ffi_cif *,void *,ffi_java_raw *,void *)
 , void *);
 CheckInterfacedef(ffi_prep_java_raw_closure,ffi_prep_java_raw_closure_db);
-extern ffi_status ffi_prep_java_raw_closure_loc_db(struct ffi_java_raw_closure *, struct ffi_cif *, void(*fptr7)(struct ffi_cif *,void *,ffi_java_raw *,void *)
+extern ffi_status ffi_prep_java_raw_closure_loc_db(ffi_java_raw_closure *, ffi_cif *, void(*fptr7)(ffi_cif *,void *,ffi_java_raw *,void *)
 , void *, void *);
 CheckInterfacedef(ffi_prep_java_raw_closure_loc,ffi_prep_java_raw_closure_loc_db);
-extern ffi_status ffi_prep_cif_db(struct ffi_cif *, ffi_abi, unsigned int, ffi_type *, ffi_type * *);
+extern ffi_status ffi_prep_cif_db(ffi_cif *, ffi_abi, unsigned int, ffi_type *, ffi_type * *);
 CheckInterfacedef(ffi_prep_cif,ffi_prep_cif_db);
-extern ffi_status ffi_prep_cif_var_db(struct ffi_cif *, ffi_abi, unsigned int, unsigned int, ffi_type *, ffi_type * *);
+extern ffi_status ffi_prep_cif_var_db(ffi_cif *, ffi_abi, unsigned int, unsigned int, ffi_type *, ffi_type * *);
 CheckInterfacedef(ffi_prep_cif_var,ffi_prep_cif_var_db);
-extern void ffi_call_db(struct ffi_cif *, void(*fptr8)(void)
+extern void ffi_call_db(ffi_cif *, void(*fptr8)(void)
 , void *, void * *);
 CheckInterfacedef(ffi_call,ffi_call_db);
 #ifdef TET_TEST

=== modified file 'ts/devchk/glib_2_0_glib_gprintf_h.c'
--- a/ts/devchk/glib_2_0_glib_gprintf_h.c	2012-10-01 13:17:07 +0000
+++ b/ts/devchk/glib_2_0_glib_gprintf_h.c	2012-10-29 17:20:50 +0000
@@ -12,7 +12,7 @@
 #endif
 
 #include "glib-2.0/glib.h"
-#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 14) )
+#if (GLIB_MAJOR_VERSION == 2 && ((GLIB_MINOR_VERSION >= 14) && (GLIB_MINOR_VERSION < 32)))
 #include "glib-2.0/glib/gutils.h"
 #endif
 #include "glib-2.0/glib/gprintf.h"

=== modified file 'ts/devchk/glib_2_0_glib_gprintf_h.inc'
--- a/ts/devchk/glib_2_0_glib_gprintf_h.inc	2012-09-20 17:48:58 +0000
+++ b/ts/devchk/glib_2_0_glib_gprintf_h.inc	2012-10-29 17:20:50 +0000
@@ -3,6 +3,6 @@
 #endif
 
 #include "glib-2.0/glib.h"
-#if (GLIB_MAJOR_VERSION > 2 || (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION >= 14) )
+#if (GLIB_MAJOR_VERSION == 2 && ((GLIB_MINOR_VERSION >= 14) && (GLIB_MINOR_VERSION < 32)))
 #include "glib-2.0/glib/gutils.h"
 #endif

=== modified file 'ts/devchk/glib_2_0_glib_h.c'
--- a/ts/devchk/glib_2_0_glib_h.c	2012-10-25 21:24:06 +0000
+++ b/ts/devchk/glib_2_0_glib_h.c	2012-10-29 17:20:50 +0000
@@ -23,7 +23,6 @@
 struct _GKeyFile { };
 struct _GDir { };
 struct _GMainContext { };
-struct _GMutex { };
 struct _GCond { };
 struct _GMemChunk { };
 struct _GRelation { };

=== modified file 'ts/devchk/glib_2_0_glib_h.inc'
--- a/ts/devchk/glib_2_0_glib_h.inc	2012-09-20 17:36:01 +0000
+++ b/ts/devchk/glib_2_0_glib_h.inc	2012-10-29 17:20:50 +0000
@@ -14,7 +14,6 @@
 struct _GKeyFile { };
 struct _GDir { };
 struct _GMainContext { };
-struct _GMutex { };
 struct _GCond { };
 struct _GMemChunk { };
 struct _GRelation { };



More information about the lsb-messages mailing list