1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
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
|
