perf build error (linux/rbtree_augmented.h)

PATCH In review Borislav Petkov 2 participants 3 messages Oct 9, 2012 perf events

Share & tools

Borislav Petkov

author

2012-10-09 17:07 UTC #0 lore raw

Is this an already known issue (building perf on latest linus):

$ make tools/perf_install

...

../../lib/rbtree.c:24:36: fatal error: linux/rbtree_augmented.h: No such file or directory compilation terminated.
make[2]: *** [util/rbtree.o] Error 1
make[1]: *** [perf_install] Error 2
make: *** [tools/perf_install] Error 2

Thanks.

Signature · 8 lines

Regards/Gruss,
Boris.

Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551

Markus Trippelsdorf

2012-10-09 18:02 UTC #1 lore raw

PATCH 1/1 perf: Handln new rbtree implementation

Perf build fails with the new rbtree implementation:

../../lib/rbtree.c:24:36: fatal error: linux/rbtree_augmented.h: No such file or
directory
compilation terminated.
make[2]: *** [util/rbtree.o] Error 1
make[1]: *** [perf_install] Error 2
make: *** [tools/perf_install] Error 2

Fix by updating the Makefile and adding a btree_augmented.h wrapper.

Reported-by Borislav Petkov <[email protected]>

Signed-off-by Markus Trippelsdorf <[email protected]>

---
 tools/perf/Makefile                                  | 3 ++-
 tools/perf/util/include/linux/rbtree.h               | 1 -
 tools/perf/util/include/linux/rbtree_augmented.h     | 2 ++
 tools/perf/util/scripting-engines/trace-event-perl.c | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 tools/perf/util/include/linux/rbtree_augmented.h

tools/perf/Makefile +2 -1

index 86258c2..9546ff5 100644
@@ -268,6 +268,7 @@ LIB_H += util/include/linux/magic.h
 LIB_H += util/include/linux/poison.h
 LIB_H += util/include/linux/prefetch.h
 LIB_H += util/include/linux/rbtree.h
+LIB_H += util/include/linux/rbtree_augmented.h
 LIB_H += util/include/linux/string.h
 LIB_H += util/include/linux/types.h
 LIB_H += util/include/linux/linkage.h

@@ -906,7 +907,7 @@ $(OUTPUT)ui/browsers/map.o: ui/browsers/map.c $(OUTPUT)PERF-CFLAGS
 	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DENABLE_SLFUTURE_CONST $<
 
 $(OUTPUT)util/rbtree.o: ../../lib/rbtree.c $(OUTPUT)PERF-CFLAGS
-	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<
+	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Wno-unused-parameter -DETC_PERFCONFIG='"$(ETC_PERFCONFIG_SQ)"' $<
 
 $(OUTPUT)util/parse-events.o: util/parse-events.c $(OUTPUT)PERF-CFLAGS
 	$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) -Wno-redundant-decls $<

tools/perf/util/include/linux/rbtree.h +0 -1

index 9bcdc84..2a030c5 100644
@@ -1,3 +1,2 @@
 #include <stdbool.h>
-#include <stdbool.h>
 #include "../../../../include/linux/rbtree.h"

tools/perf/util/include/linux/rbtree_augmented.h new file +2 -0

new file mode 100644
index 0000000..9d6fcdf
@@ -0,0 +1,2 @@
+#include <stdbool.h>
+#include "../../../../include/linux/rbtree_augmented.h"

tools/perf/util/scripting-engines/trace-event-perl.c +0 -0

index f80605e..f53889d 100644

Signature · 1 line

Markus

Borislav Petkov

author Tested-by on v1 1/1

2012-10-09 18:35 UTC #2 lore raw

Re: [PATCH] perf: Handln new rbtree implementation

Quoted 10 lines · Markus Trippelsdorf

Perf build fails with the new rbtree implementation:
../../lib/rbtree.c:24:36: fatal error: linux/rbtree_augmented.h: No such file or
directory
compilation terminated.
make[2]: *** [util/rbtree.o] Error 1
make[1]: *** [perf_install] Error 2
make: *** [tools/perf_install] Error 2

Quoted 4 lines

Fix by updating the Makefile and adding a btree_augmented.h wrapper.
Reported-by Borislav Petkov <[email protected]>
Signed-off-by Markus Trippelsdorf <[email protected]>

Good job!

Tested-by Borislav Petkov <[email protected]>

Thanks.

Signature · 8 lines

Regards/Gruss,
Boris.

Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551