glib-06-solaris-port.diff revision 20778
20216N/Adiff -rup glib-2.28.6/configure.ac ../amd64/glib-2.28.6/configure.ac
20216N/A--- glib-2.28.6/configure.ac 2011-04-14 00:55:29.000000000 +0200
20216N/A+++ ../amd64/glib-2.28.6/configure.ac 2011-04-18 10:56:45.263546437 +0200
20216N/A@@ -496,11 +496,12 @@ case $with_libiconv in
20216N/A esac
20216N/A
20216N/A dnl Initialize libtool
20216N/A-LT_PREREQ([2.2])
20216N/A-LT_INIT([disable-static win32-dll])
20216N/A-dnl when using libtool 2.x create libtool early, because it's used in configure
20216N/A-m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
20216N/A+#LT_PREREQ([2.2])
20216N/A+#LT_INIT([disable-static win32-dll])
20216N/A+#dnl when using libtool 2.x create libtool early, because it's used in configure
20216N/A+#m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
20216N/A
20216N/A+AC_PROG_LIBTOOL
20216N/A
20216N/A if test "x$GCC" = "xyes"; then
20216N/A case " $CFLAGS " in
20216N/Adiff -rup glib-2.28.6/gio/tests/de.po ../amd64/glib-2.28.6/gio/tests/de.po
20216N/A--- glib-2.28.6/gio/tests/de.po 2010-09-27 20:48:33.000000000 +0200
20216N/A+++ ../amd64/glib-2.28.6/gio/tests/de.po 2011-04-18 10:56:45.263772192 +0200
20216N/A@@ -12,6 +12,5 @@ msgstr ""
20216N/A msgid "\"Unnamed\""
20216N/A msgstr "\"Unbenannt\""
20216N/A
20216N/A-msgctxt "keyboard label"
20216N/A msgid "\"BackSpace\""
20216N/A msgstr "\"Löschen\""
20216N/Adiff -rup glib-2.28.6/glib/Makefile.am ../amd64/glib-2.28.6/glib/Makefile.am
20216N/A--- glib-2.28.6/glib/Makefile.am 2011-04-14 00:55:29.000000000 +0200
20216N/A+++ ../amd64/glib-2.28.6/glib/Makefile.am 2011-04-18 10:56:31.979293844 +0200
20778N/A@@ -355,10 +355,10 @@ INSTALL_PROGS=
20216N/A
20216N/A if ENABLE_DTRACE
20216N/A glib_probes.h: glib_probes.d Makefile
20778N/A- $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
20778N/A+ $(AM_V_GEN) $(DTRACE) $(DFLAGS) -C -h -s $< -o $@.tmp
20778N/A @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
20216N/A glib_probes.o: glib_probes.d Makefile
20778N/A- $(AM_V_GEN) $(DTRACE) -G -s $< -o $@
20778N/A+ $(AM_V_GEN) $(DTRACE) $(DFLAGS) -G -s $< -o $@
20216N/A BUILT_SOURCES += glib_probes.h glib_probes.o
20216N/A CLEANFILES += glib_probes.h glib_probes.h.tmp
20216N/A libglib_2_0_la_LIBADD += glib_probes.o
20216N/Adiff -rup glib-2.28.6/glib/tests/mem-overflow.c ../amd64/glib-2.28.6/glib/tests/mem-overflow.c
20216N/A--- glib-2.28.6/glib/tests/mem-overflow.c 2010-09-27 20:48:33.000000000 +0200
20216N/A+++ ../amd64/glib-2.28.6/glib/tests/mem-overflow.c 2011-04-18 10:56:45.264447403 +0200
20216N/A@@ -99,7 +99,7 @@ mem_overflow (void)
20216N/A CHECK_PASS (g_renew (X, q, b));
20216N/A free (q);
20216N/A }
20216N/A-
20216N/A+#ifndef sun
20216N/A typedef struct
20216N/A {
20216N/A } Empty;
20216N/A@@ -121,6 +121,7 @@ empty_alloc (void)
20216N/A }
20216N/A g_test_trap_assert_passed ();
20216N/A }
20216N/A+#endif
20216N/A
20216N/A int
20216N/A main (int argc,
20216N/A@@ -131,7 +132,9 @@ main (int argc,
20216N/A g_test_bug_base ("http://bugzilla.gnome.org/");
20216N/A
20216N/A g_test_add_func ("/mem/overflow", mem_overflow);
20216N/A+#ifndef sun
20216N/A g_test_add_func ("/mem/empty-alloc", empty_alloc);
20216N/A+#endif
20216N/A
20216N/A return g_test_run();
20216N/A }
20778N/A--- glib-2.29.10/glib/tests/Makefile.am-orig 2011-07-05 22:00:02.940145399 -0500
20778N/A+++ glib-2.29.10/glib/tests/Makefile.am 2011-07-05 22:00:09.488320746 -0500
20778N/A@@ -185,7 +185,7 @@ unix_nothreads_SOURCES = unix.c
20778N/A unix_nothreads_LDADD = $(progs_ldadd)
20778N/A
20778N/A noinst_PROGRAMS += atomic
20778N/A-atomic_CFLAGS = -Wstrict-aliasing=2 $(INCLUDES)
20778N/A+atomic_CFLAGS = $(INCLUDES)
20778N/A atomic_LDADD = $(progs_ldadd)
20778N/A
20778N/A TEST_PROGS += bitlock