Skip to content

Commit d2141c1

Browse files
authored
gProfiler 1.30.0 & reenable staticx for Aarch64 (#806)
PR #622 accidentally removed invocation of staticx on Aarch64 builds.
1 parent 38d9d68 commit d2141c1

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

gprofiler/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Copyright (c) Granulate. All rights reserved.
33
# Licensed under the AGPL3 License. See LICENSE.md in the project root for license information.
44
#
5-
__version__ = "1.29.0"
5+
__version__ = "1.30.0"

pyi.Dockerfile

+4-7
Original file line numberDiff line numberDiff line change
@@ -287,14 +287,11 @@ COPY ./scripts/list_needed_libs.sh ./scripts/list_needed_libs.sh
287287
# in some cases, when the application is lazily loading some DSOs, staticx doesn't handle it.
288288
# we use list_needed_libs.sh to list the dynamic dependencies of *all* of our resources,
289289
# and make staticx pack them as well.
290-
# using scl here to get the proper LD_LIBRARY_PATH set
291-
# hadolint ignore=SC2046,SC2086
290+
# hadolint ignore=SC2086
292291
RUN set -e; \
293-
if [ $(uname -m) != "aarch64" ]; then \
294-
LIBS=$(./scripts/list_needed_libs.sh) && \
295-
staticx $LIBS dist/gprofiler dist/gprofiler ; \
296-
fi
292+
LIBS=$(./scripts/list_needed_libs.sh) && \
293+
staticx $LIBS dist/gprofiler dist/gprofiler.static
297294

298295
FROM scratch AS export-stage
299296

300-
COPY --from=build-stage /app/dist/gprofiler /gprofiler
297+
COPY --from=build-stage /app/dist/gprofiler.static /gprofiler

0 commit comments

Comments
 (0)