summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-10-07 17:49:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-14 16:55:28 +0100
commit7241b288b7a5772f6364bb7a5a9bdeeb7cebb5bc (patch)
tree141dea363c4ebfb667603b5f2390b51438d341c9 /meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch
parentd0b578de845f8ac4b5943d874433700b0509900f (diff)
downloadpoky-7241b288b7a5772f6364bb7a5a9bdeeb7cebb5bc.tar.gz
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 <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch42
1 files changed, 0 insertions, 42 deletions
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 @@
1Upstream-Status: Pending
2
3Pass CC & CFLAGS vars so that tune parameters get used.
4This fixes compilation with x32 toolchain.
5
6Received this patch from H.J. Lu <hjl.tools@gmail.com>
7Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13
8
9Index: glib-2.30.0/glib/Makefile.am
10===================================================================
11--- glib-2.30.0.orig/glib/Makefile.am
12+++ glib-2.30.0/glib/Makefile.am
13@@ -359,10 +359,10 @@ INSTALL_PROGS=
14
15 if ENABLE_DTRACE
16 glib_probes.h: glib_probes.d Makefile
17- $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
18+ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp
19 @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
20 glib_probes.o: glib_probes.d Makefile
21- $(AM_V_GEN) $(DTRACE) -G -s $< -o $@
22+ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@
23 BUILT_SOURCES += glib_probes.h glib_probes.o
24 CLEANFILES += glib_probes.h glib_probes.h.tmp
25 libglib_2_0_la_LIBADD += glib_probes.o
26Index: glib-2.30.0/gobject/Makefile.am
27===================================================================
28--- glib-2.30.0.orig/gobject/Makefile.am
29+++ glib-2.30.0/gobject/Makefile.am
30@@ -141,10 +141,10 @@ gobject_c_sources = \
31
32 if ENABLE_DTRACE
33 gobject_probes.h: gobject_probes.d Makefile
34- $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
35+ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp
36 @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
37 gobject_probes.o: gobject_probes.d Makefile
38- $(AM_V_GEN) $(DTRACE) -G -s $< -o $@
39+ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@
40 BUILT_SOURCES += gobject_probes.h gobject_probes.o
41 CLEANFILES += gobject_probes.h
42 libgobject_2_0_la_LIBADD += gobject_probes.o