summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-06-11 12:18:48 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-11 15:55:58 +0100
commit7a434806ebed84baca1c10637328b730b93e3742 (patch)
tree3852c81e37e3303e600f6ec6335de16b22e5be73
parent1f99e74e00ba87cfd297536ca25c6fb3a8b63a44 (diff)
downloadpoky-7a434806ebed84baca1c10637328b730b93e3742.tar.gz
glib-2.0: drop Makefile.in hunks from patch
Patching a generated file is prone to conflicts, and we'll be replacing this file anyway when configuring, so drop the Makefile.in hunks. (From OE-Core rev: a3fa323c4d24375be9b783281c3cf31c0707ecb7) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/glib-2.0_fix_for_x32.patch34
1 files changed, 0 insertions, 34 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
index 2920e2fa34..0c243cddae 100644
--- 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
@@ -23,23 +23,6 @@ Index: glib-2.30.0/glib/Makefile.am
23 BUILT_SOURCES += glib_probes.h glib_probes.o 23 BUILT_SOURCES += glib_probes.h glib_probes.o
24 CLEANFILES += glib_probes.h glib_probes.h.tmp 24 CLEANFILES += glib_probes.h glib_probes.h.tmp
25 libglib_2_0_la_LIBADD += glib_probes.o 25 libglib_2_0_la_LIBADD += glib_probes.o
26Index: 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' >$@
43Index: glib-2.30.0/gobject/Makefile.am 26Index: glib-2.30.0/gobject/Makefile.am
44=================================================================== 27===================================================================
45--- glib-2.30.0.orig/gobject/Makefile.am 28--- glib-2.30.0.orig/gobject/Makefile.am
@@ -57,20 +40,3 @@ Index: glib-2.30.0/gobject/Makefile.am
57 BUILT_SOURCES += gobject_probes.h gobject_probes.o 40 BUILT_SOURCES += gobject_probes.h gobject_probes.o
58 CLEANFILES += gobject_probes.h 41 CLEANFILES += gobject_probes.h
59 libgobject_2_0_la_LIBADD += gobject_probes.o 42 libgobject_2_0_la_LIBADD += gobject_probes.o
60Index: 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