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

Fixes #14486: AIX agent fails when there is a libcrypto in system libs #1820

Merged
Changes from all commits
Commits
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
11 changes: 7 additions & 4 deletions rudder-agent/SOURCES/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -317,13 +317,16 @@ endif
cp -r initial-promises/ $(DESTDIR)/opt/rudder/share/
cp -r initial-ncf/ $(DESTDIR)/opt/rudder/share/

# Strip binaries
find $(DESTDIR) -print0 | xargs -0 file | grep -E "executable|shared object" \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
# Strip binaries
ifeq (aix,$(OS_FAMILY))
find $(DESTDIR) -type f | xargs file | grep -E "executable|shared object" | cut -f 1 -d : | xargs strip 2> /dev/null || true
else
find $(DESTDIR) -type f -print0 | xargs -0 file | grep -E "executable|shared object" | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
endif

# Aix doesn't have libgcc by default, embed it from the builder
ifeq (aix,$(OS_FAMILY))
cp /opt/freeware/lib/gcc/powerpc-ibm-aix5.3.0.0/4.8.2/libgcc* %{buildroot}/opt/rudder/lib
cp /opt/freeware/lib/gcc/powerpc-ibm-aix5.3.0.0/4.8.2/libgcc* $(DESTDIR)/opt/rudder/lib
endif

# clean
Expand Down