gentoo resync : 14.05.2020

3 files changed, 109 insertions, 1 deletions

diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 8976a62cda91..fdc138dd721a 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1,7 +1,8 @@
 AUX trace-cmd-2.8-python-pkgconfig-name.patch 987 BLAKE2B b7fcb2f8813f924692647f16252c5b576ec1a25089e5f03f5ab5d4240f8d7cb8a8cec49cb674f1a75ee562dee0112d17fbe5527b27e72445d8c246a8f535869d SHA512 9677cb02d336accc136911240c16723ca676d5f245f34dc657d6662ff20df47db14f7370becd1bb2c118a38f83c80a13d062597a0e1a8af9dc96dc6d88804991
+AUX trace-cmd-2.8.3-gcc10.patch 4431 BLAKE2B 5a764507af7b88de0732728a4d401360c78edb764779d5747ba7a8015aba84152a168329446e9d8719737ecfc054581d59cd9d47e5752375cd52483f4bcd1674 SHA512 3bee6e226b731011c1dc1acaa2e324fbd44c7743773f6176087e542778cc79b1c6960868454cf6138519fcbaa00eed0b63de8203857fba7bc137c4213ef5a084
 AUX trace-cmd-2.8.3-python3-warnings.patch 1281 BLAKE2B 66540f016d1ca3a7f5a803bd0753ac9c458fcee43056ec05e420fbeaee8b21cd0c4d38e67286d86ddeb6e478fa1e82d45203f538921bd066aa4ef2ad1222e4d7 SHA512 5446a13e82c9be3c6ed2bdc17b91495499b9f28eaa4045869bbf847ca14953cf36411e86136133b22bba05dae46325b522c00939c33943d5135c17e845fad94a
 AUX trace-cmd-2.8.3-soname.patch 392 BLAKE2B 334e2289dd1132798b1b704b071868715b38ad9308e1ab13abc7417ef55d06f9c07dd62fa3380e55d07020ffafe7d1adea10be6013b731c46583ed21d2cc1f33 SHA512 37096da570d3a926f06ef08731ff4adecc5cdaa2d3035668aa62d813db9facaa5b78189a2a7c9066c4291a90460978886e7f24759a865514335cd3ba1680b6f2
 DIST trace-cmd-v2.8.3.tar.gz 1996617 BLAKE2B 0ab77649af90a0a9368ff118dc94e6fd003b18ceb2065ae3a4559a1d2cfa93be44d87bfb97e2e2f06898508699ff5ce18face4edefd7e40b3b9cca405a626cff SHA512 51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b
-EBUILD trace-cmd-2.8.3.ebuild 2462 BLAKE2B ee4fcee10013f0c40bb15b11ed4055f33dd819a5219ab60c1b3bc12d343aab5ce71f27d112bf7f0c6d144c86e42fdfa1ef87368bf4a3a84c05f9690a5c479369 SHA512 9a7be2aa3591bcf312df225803ab4b0fdcbf97e8be9a0f76410d303c74c65a6754303db5d3da8442d5249a1705658f2175ac1a5dc6db21f719f4d9a870dd5315
+EBUILD trace-cmd-2.8.3.ebuild 2523 BLAKE2B 615d9186fb476dc5a49f9ef8f9bf2286fe0921236762b76120866050fa23c2782cc03e8a9c73dfae110e364be8a6b65834a4cd6844b7caae851593e9a24f068b SHA512 ff83354331a3c7eb5bfe3ee96c7fc667d841db0bd0c7de3f6f230f0eec4bf93ceac85a1024e89ef744435cd8e333380014f7958759e922cbc934dfe54a5914cb
 EBUILD trace-cmd-9999.ebuild 2216 BLAKE2B 616f124b5f3cb45821c780fb335396e261ce8e926cf729852a4818a38db7cbac25c7efb28dcea4c816766bd489d64805881209f8e0ec99b37f21ff5aee928073 SHA512 79cd77c02babbdf464082a8f39b33da85e6c4eddbd4d8552d51168d879a5837a74f880d102e7a7d1bbe0526690c4d82156080d69cb116476fc003eaec2ff6400
 MISC metadata.xml 349 BLAKE2B 1e1c9812f4cfe7bb90e2637dcf21947f2702244cabc78ac2283112af7a51064d5a4732db71aaa360e6f111f5e6e5b8492e04252e84379cd21424113d2779ea71 SHA512 0a6322fba3de56559284a0f1e4abc83791cf089a74cb369d167b30dadaa019353c8eef0e09e91ad84b130f0660c1dfa665e4252987903884029f4d08fe80c552
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8.3-gcc10.patch b/dev-util/trace-cmd/files/trace-cmd-2.8.3-gcc10.patch
new file mode 100644
index 000000000000..709347448df2
--- /dev/null
+++ b/dev-util/trace-cmd/files/trace-cmd-2.8.3-gcc10.patch
@@ -0,0 +1,104 @@
+diff --git a/tracecmd/trace-hist.c b/tracecmd/trace-hist.c
+index 384a7ff..e0e7c47 100644
+--- a/tracecmd/trace-hist.c
++++ b/tracecmd/trace-hist.c
+@@ -27,26 +27,26 @@ static int kernel_stack_type;
+ 
+ static int long_size;
+ 
+-struct tep_format_field *common_type_field;
+-struct tep_format_field *common_pid_field;
+-struct tep_format_field *sched_wakeup_comm_field;
+-struct tep_format_field *sched_wakeup_new_comm_field;
+-struct tep_format_field *sched_wakeup_pid_field;
+-struct tep_format_field *sched_wakeup_new_pid_field;
+-struct tep_format_field *sched_switch_prev_field;
+-struct tep_format_field *sched_switch_next_field;
+-struct tep_format_field *sched_switch_prev_pid_field;
+-struct tep_format_field *sched_switch_next_pid_field;
+-struct tep_format_field *function_ip_field;
+-struct tep_format_field *function_parent_ip_field;
+-struct tep_format_field *function_graph_entry_func_field;
+-struct tep_format_field *function_graph_entry_depth_field;
+-struct tep_format_field *function_graph_exit_func_field;
+-struct tep_format_field *function_graph_exit_depth_field;
+-struct tep_format_field *function_graph_exit_calltime_field;
+-struct tep_format_field *function_graph_exit_rettime_field;
+-struct tep_format_field *function_graph_exit_overrun_field;
+-struct tep_format_field *kernel_stack_caller_field;
++static struct tep_format_field *common_type_hist;
++static struct tep_format_field *common_pid_field;
++static struct tep_format_field *sched_wakeup_comm_field;
++static struct tep_format_field *sched_wakeup_new_comm_field;
++static struct tep_format_field *sched_wakeup_pid_field;
++static struct tep_format_field *sched_wakeup_new_pid_field;
++static struct tep_format_field *sched_switch_prev_field;
++static struct tep_format_field *sched_switch_next_field;
++static struct tep_format_field *sched_switch_prev_pid_field;
++static struct tep_format_field *sched_switch_next_pid_field;
++static struct tep_format_field *function_ip_field;
++static struct tep_format_field *function_parent_ip_field;
++static struct tep_format_field *function_graph_entry_func_field;
++static struct tep_format_field *function_graph_entry_depth_field;
++static struct tep_format_field *function_graph_exit_func_field;
++static struct tep_format_field *function_graph_exit_depth_field;
++static struct tep_format_field *function_graph_exit_calltime_field;
++static struct tep_format_field *function_graph_exit_rettime_field;
++static struct tep_format_field *function_graph_exit_overrun_field;
++static struct tep_format_field *kernel_stack_caller_field;
+ 
+ static int compact;
+ 
+@@ -568,7 +568,7 @@ process_record(struct tep_handle *pevent, struct tep_record *record)
+ 	unsigned long long val;
+ 	int type;
+ 
+-	tep_read_number_field(common_type_field, record->data, &val);
++	tep_read_number_field(common_type_hist, record->data, &val);
+ 	type = val;
+ 
+ 	if (type == function_type)
+@@ -956,8 +956,8 @@ static void do_trace_hist(struct tracecmd_input *handle)
+ 
+ 	long_size = tracecmd_long_size(handle);
+ 
+-	common_type_field = tep_find_common_field(event, "common_type");
+-	if (!common_type_field)
++	common_type_hist = tep_find_common_field(event, "common_type");
++	if (!common_type_hist)
+ 		die("Can't find a 'type' field?");
+ 
+ 	common_pid_field = tep_find_common_field(event, "common_pid");
+diff --git a/tracecmd/trace-mem.c b/tracecmd/trace-mem.c
+index 078a61b..630aeff 100644
+--- a/tracecmd/trace-mem.c
++++ b/tracecmd/trace-mem.c
+@@ -30,7 +30,7 @@ static int kmem_cache_alloc_type;
+ static int kmem_cache_alloc_node_type;
+ static int kmem_cache_free_type;
+ 
+-struct tep_format_field *common_type_field;
++static struct tep_format_field *common_type_mem;
+ 
+ struct tep_format_field *kmalloc_callsite_field;
+ struct tep_format_field *kmalloc_bytes_req_field;
+@@ -369,7 +369,7 @@ process_record(struct tep_handle *pevent, struct tep_record *record)
+ 	unsigned long long val;
+ 	int type;
+ 
+-	tep_read_number_field(common_type_field, record->data, &val);
++	tep_read_number_field(common_type_mem, record->data, &val);
+ 	type = val;
+ 
+ 	if (type == kmalloc_type)
+@@ -490,8 +490,8 @@ static void do_trace_mem(struct tracecmd_input *handle)
+ 	ret = tep_data_type(pevent, record);
+ 	event = tep_find_event(pevent, ret);
+ 
+-	common_type_field = tep_find_common_field(event, "common_type");
+-	if (!common_type_field)
++	common_type_mem = tep_find_common_field(event, "common_type");
++	if (!common_type_mem)
+ 		die("Can't find a 'type' field?");
+ 
+ 	update_kmalloc(pevent);
diff --git a/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
index 18ef6f197f7a..e5586ade3a32 100644
--- a/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
@@ -44,6 +44,7 @@ CONFIG_CHECK="
 PATCHES=(
 	"${FILESDIR}/trace-cmd-2.8-python-pkgconfig-name.patch"
 	"${FILESDIR}/trace-cmd-2.8.3-soname.patch"
+	"${FILESDIR}/trace-cmd-2.8.3-gcc10.patch"
 )
 
 pkg_setup() {
@@ -107,4 +108,6 @@ python_install() {
 		install_python
 
 	popd > /dev/null || die
+
+	python_optimize
 }