Skip to content

java: Build async-profiler with -static-libstdc++ #139

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.

Sign up for GitHub

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

Merged
merged 9 commits into from
Jul 13, 2021
Merged

java: Build async-profiler with -static-libstdc++ #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8b2aa02
Build async-profiler on centos:7
Jongy Jul 12, 2021
a9aef69
Build async-profiler with -static-libstdc++
Jongy Jul 12, 2021
cbe1dc5
Use static jattach (jattach built on centos:7 doesn't run on centos:6)
Jongy Jul 12, 2021
d7188a1
Update async-profiler tag
Jongy Jul 13, 2021
b910856
Merge branch 'master' into async-profiler-static-libstdcpp
Jongy Jul 13, 2021
1e3714c
Keep git revision in a variable
Jongy Jul 13, 2021
0defbb4
Bump gProfiler version
Jongy Jul 13, 2021
edd840d
Revert "Build async-profiler on centos:7"
Jongy Jul 13, 2021
96bca66
Build async-profiler with devtoolset 7 (for new GCC)
Jongy Jul 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ COPY scripts/phpspy_build.sh .
RUN ./phpspy_build.sh

# async-profiler
# requires CentOS 6, so the built DSO can be loaded into machines running with old glibc.
# centos:6
FROM centos@sha256:dec8f471302de43f4cfcf82f56d99a5227b5ea1aa6d02fa56344986e1f4610e7 AS async-profiler-builder
COPY scripts/async_profiler_env.sh .
Expand Down
2 changes: 1 addition & 1 deletion gprofiler/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.1.4"
__version__ = "1.1.6"
2 changes: 2 additions & 0 deletions pyi.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ COPY scripts/phpspy_build.sh .
RUN ./phpspy_build.sh

# async-profiler
# requires CentOS 6, so the built DSO can be loaded into machines running with old glibc.
# centos:6
FROM centos@sha256:dec8f471302de43f4cfcf82f56d99a5227b5ea1aa6d02fa56344986e1f4610e7 AS async-profiler-builder
COPY scripts/async_profiler_env.sh .
RUN ./async_profiler_env.sh
Expand Down
8 changes: 6 additions & 2 deletions scripts/async_profiler_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@
#
set -euo pipefail

VERSION=v2.0g3
VERSION=v2.0g4
GIT_REV=9d29169e34abc004f534a85ba6a4cf8920250381
OUTPUT=async-profiler-2.0-linux-x64.tar.gz

git clone --depth 1 -b "$VERSION" https://github.com/Granulate/async-profiler.git && cd async-profiler && git reset --hard 51447a849d686e899c1cd393e83f0f7c41685d95
git clone --depth 1 -b "$VERSION" https://github.com/Granulate/async-profiler.git && cd async-profiler && git reset --hard "$GIT_REV"
set +eu # this funny script has errors :shrug:
source scl_source enable devtoolset-7
set -eu
make release

# add a version file to the build directory
Expand Down
15 changes: 10 additions & 5 deletions scripts/async_profiler_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,14 @@
#
set -euo pipefail

# fix legacy yum repos. slightly adapted from https://stackoverflow.com/a/53848450
# this basically comments out all mirrorlist URLs, uncomments all baseurls (all seem to be commented)
# and replaces the domain from mirror.centos.org to vault.centos.org.
sed -i -e 's|^mirrorlist|#mirrorlist|' -e 's|^# *baseurl|baseurl|' -e 's|mirror.centos.org|vault.centos.org|' /etc/yum.repos.d/*
function fix_legacy_repos() {
# fix legacy yum repos. slightly adapted from https://stackoverflow.com/a/53848450
# this basically comments out all mirrorlist URLs, uncomments all baseurls (all seem to be commented)
# and replaces the domain from mirror.centos.org to vault.centos.org.
sed -i -e 's|^mirrorlist|#mirrorlist|' -e 's|^# *baseurl|baseurl|' -e 's|mirror.centos.org|vault.centos.org|' /etc/yum.repos.d/*
}

yum install -y gcc g++ gcc-c++.x86_64 make java-1.8.0-openjdk-devel glibc-static git
fix_legacy_repos
yum install -y centos-release-scl
fix_legacy_repos # fix again, after adding new scl repos
yum install -y devtoolset-7-toolchain make java-1.8.0-openjdk-devel glibc-static git