diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-12-02 12:20:04 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-05 22:47:07 +0000 |
commit | 89664754fb073f9be2ee2cfdaa0dbbe002ae561f (patch) | |
tree | 22fe8c791aa92829fc79bfa5a607ea231ec643c7 /meta/recipes-core/glib-2.0/glib-2.0 | |
parent | a41df69a11a27ab67c0c6df08546f66ec3d83da6 (diff) | |
download | poky-89664754fb073f9be2ee2cfdaa0dbbe002ae561f.tar.gz |
glib-2.0: fix compilatoin with x32 toolchain
Pass along CC & CFLAGS vars so that the tune parameters set get used.
This fixes compilation with x32 toolchain.
(From OE-Core rev: 512a28b014786a5585d27dbfc785efd620c1d7d6)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch | 76 |
1 files changed, 76 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..70cbbbe915 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch | |||
@@ -0,0 +1,76 @@ | |||
1 | UpstreamStatus: 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/glib/Makefile.in | ||
27 | =================================================================== | ||
28 | --- glib-2.30.0.orig/glib/Makefile.in | ||
29 | +++ glib-2.30.0/glib/Makefile.in | ||
30 | @@ -1691,10 +1691,10 @@ uninstall-local: uninstall-ms-lib uninst | ||
31 | @OS_WIN32_AND_DLL_COMPILATION_FALSE@uninstall-def-file: | ||
32 | |||
33 | @ENABLE_DTRACE_TRUE@glib_probes.h: glib_probes.d Makefile | ||
34 | -@ENABLE_DTRACE_TRUE@ $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp | ||
35 | +@ENABLE_DTRACE_TRUE@ $(AM_V_GEN) CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp | ||
36 | @ENABLE_DTRACE_TRUE@ @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp | ||
37 | @ENABLE_DTRACE_TRUE@glib_probes.o: glib_probes.d Makefile | ||
38 | -@ENABLE_DTRACE_TRUE@ $(AM_V_GEN) $(DTRACE) -G -s $< -o $@ | ||
39 | +@ENABLE_DTRACE_TRUE@ $(AM_V_GEN) CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@ | ||
40 | |||
41 | gspawn-win32-helper-console.c: | ||
42 | echo '#define HELPER_CONSOLE' >$@ | ||
43 | Index: glib-2.30.0/gobject/Makefile.am | ||
44 | =================================================================== | ||
45 | --- glib-2.30.0.orig/gobject/Makefile.am | ||
46 | +++ glib-2.30.0/gobject/Makefile.am | ||
47 | @@ -141,10 +141,10 @@ gobject_c_sources = \ | ||
48 | |||
49 | if ENABLE_DTRACE | ||
50 | gobject_probes.h: gobject_probes.d Makefile | ||
51 | - $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp | ||
52 | + $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp | ||
53 | @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp | ||
54 | gobject_probes.o: gobject_probes.d Makefile | ||
55 | - $(AM_V_GEN) $(DTRACE) -G -s $< -o $@ | ||
56 | + $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@ | ||
57 | BUILT_SOURCES += gobject_probes.h gobject_probes.o | ||
58 | CLEANFILES += gobject_probes.h | ||
59 | libgobject_2_0_la_LIBADD += gobject_probes.o | ||
60 | Index: glib-2.30.0/gobject/Makefile.in | ||
61 | =================================================================== | ||
62 | --- glib-2.30.0.orig/gobject/Makefile.in | ||
63 | +++ glib-2.30.0/gobject/Makefile.in | ||
64 | @@ -1581,10 +1581,10 @@ uninstall-ms-lib: | ||
65 | @OS_WIN32_AND_DLL_COMPILATION_FALSE@uninstall-def-file: | ||
66 | |||
67 | @ENABLE_DTRACE_TRUE@gobject_probes.h: gobject_probes.d Makefile | ||
68 | -@ENABLE_DTRACE_TRUE@ $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp | ||
69 | +@ENABLE_DTRACE_TRUE@ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp | ||
70 | @ENABLE_DTRACE_TRUE@ @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp | ||
71 | @ENABLE_DTRACE_TRUE@gobject_probes.o: gobject_probes.d Makefile | ||
72 | -@ENABLE_DTRACE_TRUE@ $(AM_V_GEN) $(DTRACE) -G -s $< -o $@ | ||
73 | +@ENABLE_DTRACE_TRUE@ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@ | ||
74 | |||
75 | # This is read by gobject-introspection/misc/ and gtk-doc | ||
76 | gobject-public-headers.txt: Makefile | ||