From 7241b288b7a5772f6364bb7a5a9bdeeb7cebb5bc Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 7 Oct 2013 17:49:07 +0000 Subject: glib-2.0: upgrade to 2.28.0 Drop the ptest patches and instead use --enable-installed-tests, updating run-ptest to invoke gnome-desktop-testing-runner. Drop the x32 build patch, upstream has integrated a similar fix. (From OE-Core rev: 33bb8d5da050519043bb913bae4f5692bbd899ad) Signed-off-by: Ross Burton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch | 42 ---------------------- 1 file changed, 42 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch (limited to 'meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch') diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch deleted file mode 100644 index 0c243cddae..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch +++ /dev/null @@ -1,42 +0,0 @@ -Upstream-Status: Pending - -Pass CC & CFLAGS vars so that tune parameters get used. -This fixes compilation with x32 toolchain. - -Received this patch from H.J. Lu -Signed-Off-By: Nitin A Kamble 2011/07/13 - -Index: glib-2.30.0/glib/Makefile.am -=================================================================== ---- glib-2.30.0.orig/glib/Makefile.am -+++ glib-2.30.0/glib/Makefile.am -@@ -359,10 +359,10 @@ INSTALL_PROGS= - - if ENABLE_DTRACE - glib_probes.h: glib_probes.d Makefile -- $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp -+ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp - @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp - glib_probes.o: glib_probes.d Makefile -- $(AM_V_GEN) $(DTRACE) -G -s $< -o $@ -+ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@ - BUILT_SOURCES += glib_probes.h glib_probes.o - CLEANFILES += glib_probes.h glib_probes.h.tmp - libglib_2_0_la_LIBADD += glib_probes.o -Index: glib-2.30.0/gobject/Makefile.am -=================================================================== ---- glib-2.30.0.orig/gobject/Makefile.am -+++ glib-2.30.0/gobject/Makefile.am -@@ -141,10 +141,10 @@ gobject_c_sources = \ - - if ENABLE_DTRACE - gobject_probes.h: gobject_probes.d Makefile -- $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp -+ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp - @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp - gobject_probes.o: gobject_probes.d Makefile -- $(AM_V_GEN) $(DTRACE) -G -s $< -o $@ -+ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@ - BUILT_SOURCES += gobject_probes.h gobject_probes.o - CLEANFILES += gobject_probes.h - libgobject_2_0_la_LIBADD += gobject_probes.o -- cgit v1.2.3-54-g00ecf