Repository: bigtop Updated Branches: refs/heads/branch-1.3 12d5a48ec -> ba97d5612
BIGTOP-3076: QFS build failed on ppc64le QFS build failed on ppc64le, this is caused by conflict definition of gf_cpu_identify. This closes #392 Change-Id: Ibc52b426a27c6ed27c71a0e8fabeaaa91577d000 Signed-off-by: Jun He <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ba97d561 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ba97d561 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ba97d561 Branch: refs/heads/branch-1.3 Commit: ba97d5612b32243e56426079c09ba9075f7b18c3 Parents: 12d5a48 Author: Jun He <[email protected]> Authored: Mon Sep 10 11:19:14 2018 +0800 Committer: Jun He <[email protected]> Committed: Tue Sep 11 02:44:50 2018 +0000 ---------------------------------------------------------------------- bigtop-packages/src/common/qfs/patch0-gf_cpu.diff | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/ba97d561/bigtop-packages/src/common/qfs/patch0-gf_cpu.diff ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/qfs/patch0-gf_cpu.diff b/bigtop-packages/src/common/qfs/patch0-gf_cpu.diff new file mode 100644 index 0000000..8dcc9c2 --- /dev/null +++ b/bigtop-packages/src/common/qfs/patch0-gf_cpu.diff @@ -0,0 +1,16 @@ +diff --git a/ext/gf-complete/src/gf_cpu.c b/ext/gf-complete/src/gf_cpu.c +index f1afa2b..a0c9b10 100644 +--- a/ext/gf-complete/src/gf_cpu.c ++++ b/ext/gf-complete/src/gf_cpu.c +@@ -206,10 +206,9 @@ void gf_cpu_identify(void) + + #else // defined(__arm__) || defined(__aarch64__) + +-int gf_cpu_identify(void) ++void gf_cpu_identify(void) + { + gf_cpu_identified = 1; +- return 0; + } + + #endif
