diff options
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch | 76 | ||||
-rw-r--r-- | meta/recipes-core/glib-2.0/glib-2.0_2.30.1.bb | 3 |
2 files changed, 78 insertions, 1 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 | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.30.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.30.1.bb index 408ab839b4..bf415a1da4 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.30.1.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.30.1.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require glib.inc | 1 | require glib.inc |
2 | 2 | ||
3 | PR = "r0" | 3 | PR = "r1" |
4 | PE = "1" | 4 | PE = "1" |
5 | 5 | ||
6 | DEPENDS += "libffi python-argparse-native" | 6 | DEPENDS += "libffi python-argparse-native" |
@@ -13,6 +13,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.bz2 \ | |||
13 | file://configure-libtool.patch \ | 13 | file://configure-libtool.patch \ |
14 | file://60_wait-longer-for-threads-to-die.patch \ | 14 | file://60_wait-longer-for-threads-to-die.patch \ |
15 | file://g_once_init_enter.patch \ | 15 | file://g_once_init_enter.patch \ |
16 | file://glib-2.0_fix_for_x32.patch \ | ||
16 | " | 17 | " |
17 | SRC_URI[md5sum] = "921ef2e86e911feb5e21f656f1ac305b" | 18 | SRC_URI[md5sum] = "921ef2e86e911feb5e21f656f1ac305b" |
18 | SRC_URI[sha256sum] = "4e560319450f31d85b6cdb2b530c3324a510ca04817e360943d0774327d21804" | 19 | SRC_URI[sha256sum] = "4e560319450f31d85b6cdb2b530c3324a510ca04817e360943d0774327d21804" |