diff options
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.patch | 42 |
1 files changed, 42 insertions, 0 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 new file mode 100644 index 0000000000..0c243cddae --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Pass CC & CFLAGS vars so that tune parameters get used. | ||
4 | This fixes compilation with x32 toolchain. | ||
5 | |||
6 | Received this patch from H.J. Lu <hjl.tools@gmail.com> | ||
7 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/07/13 | ||
8 | |||
9 | Index: 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 | ||
26 | Index: 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 | ||