Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ppc64le: Fix config and timezone embedding. #22445

Merged

Conversation

mastertheknife
Copy link
Contributor

I hereby agree to the terms of the CLA available at: https://yandex.ru/legal/cla/?lang=en

Changelog category (leave one):

  • Build/Testing/Packaging Improvement

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Fix ClickHouse's config embedding and cctz's timezone embedding on ppc64le.
...

Detailed description / Documentation draft:
Tested that clickhouse can find the embedded config, and verified just in case with readelf.
Fixes these errors:

cd /root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server && cd /root/rpmbuild/BUILD/clickhouse-21.3.3.14/programs/server && /usr/bin/llvm-objcopy -I binary config.xml /root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server/config.xml.o && /usr/bin/llvm-objcopy --rename-section .data=.rodata,alloc,load,readonly,data,contents /root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server/config.xml.o /root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server/config.xml.o
/usr/bin/llvm-objcopy: error: '/root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server/config.xml.o': The file was not recognized as a valid object file
[7/1702] Generating users.xml.o
FAILED: programs/server/users.xml.o 
cd /root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server && cd /root/rpmbuild/BUILD/clickhouse-21.3.3.14/programs/server && /usr/bin/llvm-objcopy -I binary users.xml /root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server/users.xml.o && /usr/bin/llvm-objcopy --rename-section .data=.rodata,alloc,load,readonly,data,contents /root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server/users.xml.o /root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server/users.xml.o
/usr/bin/llvm-objcopy: error: '/root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server/users.xml.o': The file was not recognized as a valid object file
[8/1702] Generating embedded.xml.o
FAILED: programs/server/embedded.xml.o 
cd /root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server && cd /root/rpmbuild/BUILD/clickhouse-21.3.3.14/programs/server && /usr/bin/llvm-objcopy -I binary embedded.xml /root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server/embedded.xml.o && /usr/bin/llvm-objcopy --rename-section .data=.rodata,alloc,load,readonly,data,contents /root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server/embedded.xml.o /root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server/embedded.xml.o
/usr/bin/llvm-objcopy: error: '/root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server/embedded.xml.o': The file was not recognized as a valid object file
[9/1702] Generating play.html.o
FAILED: programs/server/play.html.o 
cd /root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server && cd /root/rpmbuild/BUILD/clickhouse-21.3.3.14/programs/server && /usr/bin/llvm-objcopy -I binary play.html /root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server/play.html.o && /usr/bin/llvm-objcopy --rename-section .data=.rodata,alloc,load,readonly,data,contents /root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server/play.html.o /root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server/play.html.o
/usr/bin/llvm-objcopy: error: '/root/rpmbuild/BUILD/clickhouse-21.3.3.14/build/programs/server/play.html.o': The file was not recognized as a valid object file
...

...

@robot-clickhouse robot-clickhouse added the pr-build Pull request with build/testing/packaging improvement label Apr 1, 2021
@robot-clickhouse robot-clickhouse added the submodule changed At least one submodule changed in this PR. label Apr 1, 2021
@alexey-milovidov alexey-milovidov self-assigned this Apr 1, 2021
@alexey-milovidov alexey-milovidov merged commit eec4ac7 into ClickHouse:master Apr 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr-build Pull request with build/testing/packaging improvement submodule changed At least one submodule changed in this PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants