equal
deleted
inserted
replaced
|
1 Currently unused; was used to force DTRACE to compile -64; possible this |
|
2 should force -32 or -64 depending on build. |
|
3 |
|
4 Not appropriate for upstream. |
|
5 |
|
6 --- glib-2.46.0/glib/Makefile.am 2015-09-07 12:27:03.000000000 -0700 |
|
7 +++ glib-2.46.0/glib/Makefile.am 2015-09-24 22:24:14.141690708 -0700 |
|
8 @@ -366,15 +366,15 @@ |
|
9 DTCFLAGS = $(patsubst -W%,,$(CFLAGS)) |
|
10 |
|
11 glib_probes.h: glib_probes.d |
|
12 - $(AM_V_GEN) $(DTRACE) -C -h -s $< -o [email protected] |
|
13 + $(AM_V_GEN) $(DTRACE) $(DFLAGS) -C -h -s $< -o [email protected] |
|
14 @$(SED) -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < [email protected] > $@ && rm -f [email protected] |
|
15 |
|
16 -glib_probes.lo: glib_probes.d |
|
17 - $(AM_V_GEN) env CC="$(DTCOMPILE)" CFLAGS="$(DTCFLAGS)" $(DTRACE) -G -s $< -o $@ |
|
18 +glib_probes.o: glib_probes.d |
|
19 + $(AM_V_GEN) env CC="$(DTCOMPILE)" CFLAGS="$(DTCFLAGS)" $(DTRACE) $(DFLAGS) -G -s $< -o $@ |
|
20 |
|
21 -BUILT_SOURCES += glib_probes.h glib_probes.lo |
|
22 +BUILT_SOURCES += glib_probes.h glib_probes.o |
|
23 CLEANFILES += glib_probes.h glib_probes.h.tmp |
|
24 -libglib_2_0_la_LIBADD += glib_probes.lo |
|
25 +libglib_2_0_la_LIBADD += glib_probes.o |
|
26 endif |
|
27 |
|
28 if ENABLE_SYSTEMTAP |