[csw-devel] SF.net SVN: gar:[15858] csw/mgar/pkg/glib2/trunk

[guengel at users.sourceforge.net]

Revision: 15858
          http://gar.svn.sourceforge.net/gar/?rev=15858&view=rev
Author:   guengel
Date:     2011-10-05 05:44:54 +0000 (Wed, 05 Oct 2011)
Log Message:
-----------
glib2/trunk: Removed debug compiler options. Disable one more failing test on sparcv9. Added some CHECKPKG_OVERRIDES.

Modified Paths:
--------------
    csw/mgar/pkg/glib2/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/glib2/trunk/files/0023-Disable-data-input-stream-read-int-test-on-sparc.patch

Modified: csw/mgar/pkg/glib2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/glib2/trunk/Makefile	2011-10-05 00:29:03 UTC (rev 15857)
+++ csw/mgar/pkg/glib2/trunk/Makefile	2011-10-05 05:44:54 UTC (rev 15858)
@@ -47,6 +47,9 @@
 PATCHFILES += 0019-Disable-gdbus-threading-gdbus-method-calls-in-thread.patch
 PATCHFILES += 0019-Disable-volumemonitor-tests.patch
 PATCHFILES += 0022-Disable-gsettings-strinfo-on-sparcv9.patch
+PATCHFILES += 0023-Disable-data-input-stream-read-int-test-on-sparc.patch
+
+# SPARCv9 Specific Patches
 PATCHFILES_isa-sparcv9 += 0023-Disable-run-assert-msg-test.sh.patch
 
 PACKAGING_PLATFORMS += solaris9-sparc solaris9-i386
@@ -160,8 +163,8 @@
 CONFIGURE_ARGS += --disable-dtrace
 
 # DEBUGGING
-CONFIGURE_ARGS += --enable-debug=yes
-EXTRA_CFLAGS += -xO0 -g
+# CONFIGURE_ARGS += --enable-debug=yes
+# EXTRA_CFLAGS += -xO0 -g
 
 # Those are to make the checks work
 EXTRA_COMMON_EXPORTS = TZ
@@ -174,6 +177,16 @@
 #provided by iconv
 MERGE_EXCLUDE_FILES = .*/charset.alias
 
+# The checks below are excluded since /usr/share/ is included in default value of
+# XDG_DATA_DIRS. However, /opt/csw/share is also included, so no harm.
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/libgio-2.0.so.0.2800.8
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.2800.8
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgio-2.0.so.0.2800.8
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgio-2.0.so.0.2800.8
+CHECKPKG_OVERRIDES_CSWlibgio2-0-0 += file-with-bad-content|/usr/local|root/opt/csw/lib/amd64/libgio-2.0.so.0.2800.8
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/amd64/libglib-2.0.so.0.2800.8
+CHECKPKG_OVERRIDES_CSWlibglib2-0-0 += file-with-bad-content|/usr/share|root/opt/csw/lib/libglib-2.0.so.0.2800.8
+
 include gar/category.mk
 
 # We need /opt/csw/gnu/gettext, /usr/bin/gettext bails out

Added: csw/mgar/pkg/glib2/trunk/files/0023-Disable-data-input-stream-read-int-test-on-sparc.patch
===================================================================
--- csw/mgar/pkg/glib2/trunk/files/0023-Disable-data-input-stream-read-int-test-on-sparc.patch	                        (rev 0)
+++ csw/mgar/pkg/glib2/trunk/files/0023-Disable-data-input-stream-read-int-test-on-sparc.patch	2011-10-05 05:44:54 UTC (rev 15858)
@@ -0,0 +1,28 @@
+From a9c0aca79d049618498c61182e7fca862e27c206 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Mon, 3 Oct 2011 16:29:26 +0200
+Subject: [PATCH] Disable data-input-stream/read-int test on sparc
+
+The test failed when removing '-xO0 -g' from the compile options.
+---
+ gio/tests/data-input-stream.c |    3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/gio/tests/data-input-stream.c b/gio/tests/data-input-stream.c
+index 1a34205..fca8ee8 100644
+--- a/gio/tests/data-input-stream.c
++++ b/gio/tests/data-input-stream.c
+@@ -422,7 +422,10 @@ main (int   argc,
+   g_test_add_func ("/data-input-stream/read-lines-any", test_read_lines_any);
+   g_test_add_func ("/data-input-stream/read-until", test_read_until);
+   g_test_add_func ("/data-input-stream/read-upto", test_read_upto);
++  /* Fails on sparcv8 when compiling without -xO0 -g */
++#ifndef __sparc
+   g_test_add_func ("/data-input-stream/read-int", test_read_int);
++#endif
+ 
+   return g_test_run();
+ }
+-- 
+1.7.6.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.