Commit 18a0e073 authored by Thomas De Schampheleire's avatar Thomas De Schampheleire Committed by Peter Korsgaard
Browse files

infra: fix autotools .la fixing when no .la files are present 



Commit 6f638ea9 ("infra: /usr support:
STAGING_DIR can be outside BASE_DIR") changed a for-construct around 'sed
-i' in a 'find | xargs sed -i'. However, if the find returns no results,
sed complains with:
    '/bin/sed: no input files'

This commit adds the extra parameter -r / --no-run-if-empty to the xargs
call, effectively fixing this problem case.

Reported-by: default avatarRohit Kumar <rkthebest@gmail.com>
Fix-suggested-by: default avatarYann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent e3ce2eb0

package/pkg-autotools.mk

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ endif 
ifndef $(2)_INSTALL_STAGING_CMDS

define $(2)_INSTALL_STAGING_CMDS

	$$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPT) -C $$($$(PKG)_SRCDIR)

	find $$(STAGING_DIR)/usr/lib* -name "*.la" | xargs \

	find $$(STAGING_DIR)/usr/lib* -name "*.la" | xargs --no-run-if-empty \

		$$(SED) "s:$$(BASE_DIR):@BASE_DIR@:g" \

			-e "s:$$(STAGING_DIR):@STAGING_DIR@:g" \

			-e "s:\(['= ]\)/usr:\\1@STAGING_DIR@/usr:g" \