Skip to content
Open
Show file tree
Hide file tree
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
10 changes: 5 additions & 5 deletions src/buildstream_plugins/elements/autotools.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,17 @@ variables:
remove-libtool-libraries: "false"

delete-libtool-archives: |
if %{remove-libtool-modules} || %{remove-libtool-libraries}; then
find "%{install-root}" -name "*.la" -print0 | while read -d '' -r file; do
if grep '^shouldnotlink=yes$' "${file}" &>/dev/null; then
if %{remove-libtool-modules}; then
if [ "%{remove-libtool-modules}" = "true" ] || [ "%{remove-libtool-libraries}" = "true" ]; then
find "%{install-root}" -name "*.la" | while IFS= read -r file; do
if grep '^shouldnotlink=yes$' "${file}" >/dev/null 2>&1; then
if [ "%{remove-libtool-modules}" = "true" ]; then
echo "Removing ${file}."
rm "${file}"
else
echo "Not removing ${file}."
fi
else
if %{remove-libtool-libraries}; then
if [ "%{remove-libtool-libraries}" = "true" ]; then
echo "Removing ${file}."
rm "${file}"
else
Expand Down
2 changes: 1 addition & 1 deletion tests/cachekey/project/elements/autotools1.expected
Original file line number Diff line number Diff line change
@@ -1 +1 @@
98ae7c344c01c64d2597338ec632e22a36f1b78ce502a9f3ed668edd0921dcb3
1f566532b409f730be288e6138439236d65330c98269fc5956b12e02295c433b
2 changes: 1 addition & 1 deletion tests/cachekey/project/target.expected
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3dc2ed8ab56f9c706e1fbf4bacc1ab1e38d20f66c686f1ab05d5ad0e504272fc
9219dea2e49b451bbd2f8f8797ac43a31b957b51919171a3449e4d8870d2bc62