From 84af438d8a3b52838b3bae53b8be6895b0714710 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 30 Jul 2014 10:34:27 +0200 Subject: remove la file mangling. packages should use pkg-config to find options for static linking --- mk/package.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'mk/package.mk') diff --git a/mk/package.mk b/mk/package.mk index 8e30369cc..75d88c947 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -237,14 +237,10 @@ ifeq (,$(filter nostaging,$(7))) echo "$$$$x" | sed 's/^/- /' >&2; \ fi; \ find usr ! -type d 2>/dev/null | \ - grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/doc' -e '^usr/src' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config' | \ + grep -E -v -e '^usr/lib/pkgconfig' -e '^usr/share' -e '^usr/doc' -e '^usr/src' -e '^usr/man' \ + -e '^usr/info' -e '^usr/lib/libc.so' -e '^usr/bin/[a-z0-9-]+-config' -e '^usr/lib/.*\.la$$$$' | \ tee '$${STAGING_PKG_DIR}/$(1)' | \ $(STAGING_HOST_DIR)/usr/bin/cpio -padlmu '$${STAGING_TARGET_DIR}' - @cd '$${STAGING_TARGET_DIR}'; grep 'usr/lib/.*\.la$$$$' \ - '$${STAGING_PKG_DIR}/$(1)' | while read fn; do \ - chmod u+w $$$$fn; \ - $(SED) "s,\(^libdir='\| \|-L\|^dependency_libs='\)/usr/lib,\1$(STAGING_TARGET_DIR)/usr/lib,g" $$$$fn; \ - done endif ifeq (,$(filter noscripts,$(7))) @cd '$${STAGING_TARGET_DIR}'; grep 'usr/s*bin/' \ -- cgit v1.2.3