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.

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

Enhance debug_info symbols + libatomic in wheels (follows-up to #5879) #5974

Merged
merged 3 commits into from
Jan 10, 2024
Merged

Enhance debug_info symbols + libatomic in wheels (follows-up to #5879) #5974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc57c9f
strip.mk: Fix strip_target with GCC_DEBUG_INFO enabled
th0ma7 Jan 10, 2024
9f3b56a
python311: Force compiler LTO optimizations with exceptions
th0ma7 Jan 10, 2024
0b9fe6f
py311: Disable GCC_DEBUG_INFO
th0ma7 Jan 10, 2024
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
56 changes: 42 additions & 14 deletions mk/spksrc.strip.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ else
$(PRE_STRIP_TARGET): strip_msg
endif
ifeq ($(strip $(STRIP_TARGET)),)
ifneq ($(strip $(GCC_DEBUG_INFO)),1)
STRIP_TARGET = strip_target
endif
else
$(STRIP_TARGET): $(PRE_STRIP_TARGET)
endif
Expand All @@ -48,26 +46,53 @@ strip_msg:
@$(MSG) "Stripping binaries and libraries of $(NAME)"

include_libatomic:
@cat $(INSTALL_PLIST) | sed 's/:/ /' | while read type file ; \
do \
@for tclib in libatomic\.so; do \
echo "===> SEARCHING for $${tclib}" ; \
cat $(INSTALL_PLIST) | sed 's/:/ /' | while read type file ; do \
case $${type} in \
lib|bin) \
if [ "$$(objdump -p $(STAGING_DIR)/$${file} 2>/dev/null | grep NEEDED | grep libatomic\.so)" ]; then \
_libatomic_="$$(readlink $(TC_LIBRARY_PATH)/libatomic.so)" ; \
echo "===> Add libatomic from toolchain ($${_libatomic_})" ; \
install -d -m 755 $(STAGING_DIR)/lib ; \
install -m 644 $(TC_LIBRARY_PATH)/$${_libatomic_} $(STAGING_DIR)/lib/ ; \
cd $(STAGING_DIR)/lib/ && ln -sf $${_libatomic_} libatomic.so.1 ; \
cd $(STAGING_DIR)/lib/ && ln -sf $${_libatomic_} libatomic.so ; \
break ; \
fi \
;; \
if [ "$$(objdump -p $(STAGING_DIR)/$${file} 2>/dev/null | grep NEEDED | grep $${tclib})" ]; then \
echo "===> Found in $${file} for library dependency from toolchain ($${tclib})" ; \
_tclib_=$$(realpath $$(find $(TC_LIBRARY_PATH)/../. -name $${tclib})) ; \
echo "===> Add library from toolchain ($$(basename $${_tclib_}))" ; \
install -d -m 755 $(STAGING_DIR)/lib ; \
install -m 644 $${_tclib_} $(STAGING_DIR)/lib/ ; \
symlinks=$$(find $(TC_LIBRARY_PATH)/. -type l -name "$${tclib}*" -printf '%f ' | xargs) ; \
echo "===> Add symlink from toolchain ($${symlinks})" ; \
for _link_ in $${symlinks} ; do \
(cd $(STAGING_DIR)/lib/ && ln -sf $$(basename $${_tclib_}) $${_link_}) ; \
done ; \
break 2 ; \
fi ;; \
esac ; \
done ; \
for wheel in $(WORK_DIR)/wheelhouse/*.whl ; do \
for shlib in $$(zipinfo -1 $${wheel} *.so 2>/dev/null) ; do \
_tmp_=$$(mktemp -d -p $(WORK_DIR)/wheelhouse) ; \
unzip -qq -d $${_tmp_} $${wheel} $${shlib} ; \
if [ "$$(objdump -p $${_tmp_}/$${shlib} 2>/dev/null | grep NEEDED | grep $${tclib})" ]; then \
echo "===> Found in $$(basename $${wheel}) for library dependency from toolchain ($${tclib})" ; \
_tclib_=$$(realpath $$(find $(TC_LIBRARY_PATH)/../. -name $${tclib})) ; \
echo "===> Add library from toolchain ($$(basename $${_tclib_}))" ; \
install -d -m 755 $(STAGING_DIR)/lib ; \
install -m 644 $${_tclib_} $(STAGING_DIR)/lib/ ; \
symlinks=$$(find $(TC_LIBRARY_PATH)/. -type l -name "$${tclib}*" -printf '%f ' | xargs) ; \
echo "===> Add symlink from toolchain ($${symlinks})" ; \
for _link_ in $${symlinks} ; do \
(cd $(STAGING_DIR)/lib/ && ln -sf $$(basename $${_tclib_}) $${_link_}) ; \
done ; \
rm -fr $${_tmp_} ; \
break 2 ; \
fi ; \
rm -fr $${_tmp_} ; \
done ; \
done ; \
done

pre_strip_target: strip_msg

strip_target: $(PRE_STRIP_TARGET) $(INSTALL_PLIST) include_libatomic
ifneq ($(strip $(GCC_DEBUG_INFO)),1)
@cat $(INSTALL_PLIST) | sed 's/:/ /' | while read type file ; \
do \
case $${type} in \
Expand All @@ -78,6 +103,9 @@ strip_target: $(PRE_STRIP_TARGET) $(INSTALL_PLIST) include_libatomic
;; \
esac ; \
done
else
@$(MSG) GCC_DEBUG_INFO enabled: Skipping strip_target
endif

post_strip_target: $(STRIP_TARGET)

Expand Down
23 changes: 14 additions & 9 deletions spk/python311/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ WHEELS = src/requirements-pure.txt
# Force testing all wheel builds
WHEELS_TEST_ALL = 0

# Force compiler LTO optimizations
ifeq ($(strip $(WHEELS_TEST_ALL)),0)
ENV += PYTHON_OPTIMIZE=1
endif

SERVICE_SETUP = src/service-setup.sh

PYTHON_LIB_DIR = lib/python$(SPK_VERS_MAJOR_MINOR)
Expand Down Expand Up @@ -103,10 +98,20 @@ endif

include ../../mk/spksrc.common.mk

# # Enable debug_info builds for DSM6
# ifeq ($(call version_lt, ${TCVERSION}, 7),1)
# GCC_DEBUG_INFO := 1
# endif
# Enable debug_info symgols for all archs
#GCC_DEBUG_INFO := 1

# Force compiler LTO optimizations except:
# - when testing all wheels
# - when including debug_info symbols
# - when using PPC arch (fails on qoriq)
ifneq ($(strip $(WHEELS_TEST_ALL)),1)
ifneq ($(strip $(GCC_DEBUG_INFO)),1)
ifneq ($(findstring $(ARCH),$(PPC_ARCHS)),$(ARCH))
ENV += PYTHON_OPTIMIZE=1
endif
endif
endif

## WHEELS_TEST_ALL: Force testing all wheel building
ifeq ($(strip $(WHEELS_TEST_ALL)),1)
Expand Down