mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-09 10:13:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib-2.0: fix compilatoin with x32 toolchain

Browse Source 
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>
This commit is contained in:
Nitin A Kamble
2011-12-02 12:20:04 -08:00
committed by Richard Purdie
parent a41df69a11
commit 89664754fb
2 changed files with 78 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch Normal file
View File

@@ -0,0 +1,76 @@
UpstreamStatus: Pending
Pass CC & CFLAGS vars so that tune parameters get used.
This fixes compilation with x32 toolchain.
Received this patch from H.J. Lu <hjl.tools@gmail.com>
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 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/glib/Makefile.in
===================================================================
--- glib-2.30.0.orig/glib/Makefile.in
+++ glib-2.30.0/glib/Makefile.in
@@ -1691,10 +1691,10 @@ uninstall-local: uninstall-ms-lib uninst
@OS_WIN32_AND_DLL_COMPILATION_FALSE@uninstall-def-file:
@ENABLE_DTRACE_TRUE@glib_probes.h: glib_probes.d Makefile
-@ENABLE_DTRACE_TRUE@ $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
+@ENABLE_DTRACE_TRUE@ $(AM_V_GEN) CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp
@ENABLE_DTRACE_TRUE@ @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
@ENABLE_DTRACE_TRUE@glib_probes.o: glib_probes.d Makefile
-@ENABLE_DTRACE_TRUE@ $(AM_V_GEN) $(DTRACE) -G -s $< -o $@
+@ENABLE_DTRACE_TRUE@ $(AM_V_GEN) CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@
gspawn-win32-helper-console.c:
echo '#define HELPER_CONSOLE' >$@
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
Index: glib-2.30.0/gobject/Makefile.in
===================================================================
--- glib-2.30.0.orig/gobject/Makefile.in
+++ glib-2.30.0/gobject/Makefile.in
@@ -1581,10 +1581,10 @@ uninstall-ms-lib:
@OS_WIN32_AND_DLL_COMPILATION_FALSE@uninstall-def-file:
@ENABLE_DTRACE_TRUE@gobject_probes.h: gobject_probes.d Makefile
-@ENABLE_DTRACE_TRUE@ $(AM_V_GEN) $(DTRACE) -C -h -s $< -o $@.tmp
+@ENABLE_DTRACE_TRUE@ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -C -h -s $< -o $@.tmp
@ENABLE_DTRACE_TRUE@ @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
@ENABLE_DTRACE_TRUE@gobject_probes.o: gobject_probes.d Makefile
-@ENABLE_DTRACE_TRUE@ $(AM_V_GEN) $(DTRACE) -G -s $< -o $@
+@ENABLE_DTRACE_TRUE@ $(AM_V_GEN) CFLAGS="$(CFLAGS)" $(DTRACE) -G -s $< -o $@
# This is read by gobject-introspection/misc/ and gtk-doc
gobject-public-headers.txt: Makefile

3
meta/recipes-core/glib-2.0/glib-2.0_2.30.1.bb
View File

@@ -1,6 +1,6 @@
require glib.inc
PR = "r0"
PR = "r1"
PE = "1"
DEPENDS += "libffi python-argparse-native"
@@ -13,6 +13,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.bz2 \
file://configure-libtool.patch \
file://60_wait-longer-for-threads-to-die.patch \
file://g_once_init_enter.patch \
file://glib-2.0_fix_for_x32.patch \
"
SRC_URI[md5sum] = "921ef2e86e911feb5e21f656f1ac305b"
SRC_URI[sha256sum] = "4e560319450f31d85b6cdb2b530c3324a510ca04817e360943d0774327d21804"