From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas De Schampheleire Date: Tue, 7 Feb 2017 22:56:48 +0100 Subject: [Buildroot] [PATCHv3 11/12] toolchain: copy_toolchain_lib_root: clarify input parameter In-Reply-To: <20170207215649.364-1-patrickdepinguin@gmail.com> References: <20170207215649.364-1-patrickdepinguin@gmail.com> Message-ID: <20170207215649.364-12-patrickdepinguin@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net From: Thomas De Schampheleire The input to copy_toolchain_lib_root is not one library, not a list of libraries, but a library name pattern with glob wildcards. This pattern is then passed to 'find' to get the actual list of libraries matching the pattern. Reflect this using an appropriate variable name. Note: if the root of the buildroot tree contains a file matching one of these library patterns, the copying of libraries from staging to target will not be correct. It is not impossible to fix that, e.g. using 'set -f', but maybe it's not worth it. Signed-off-by: Thomas De Schampheleire --- v3: no changes v2: new patch package/glibc/glibc.mk | 4 ++-- toolchain/helpers.mk | 6 +++--- toolchain/toolchain-external/pkg-toolchain-external.mk | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index c11f7cd..2da9606 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -110,8 +110,8 @@ GLIBC_LIBS_LIB += libthread_db.so.* endif define GLIBC_INSTALL_TARGET_CMDS - for libs in $(GLIBC_LIBS_LIB); do \ - $(call copy_toolchain_lib_root,$$libs) ; \ + for libpattern in $(GLIBC_LIBS_LIB); do \ + $(call copy_toolchain_lib_root,$$libpattern) ; \ done endef diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 87733be..95505aa 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -6,12 +6,12 @@ # toolchain logic, and the glibc package, so care must be taken when # changing this function. # -# $1: library name +# $1: library name pattern (can include glob wildcards) # copy_toolchain_lib_root = \ - LIB="$(strip $1)"; \ + LIBPATTERN="$(strip $1)"; \ \ - LIBPATHS=`find $(STAGING_DIR)/ -name "$${LIB}" 2>/dev/null` ; \ + LIBPATHS=`find $(STAGING_DIR)/ -name "$${LIBPATTERN}" 2>/dev/null` ; \ for LIBPATH in $${LIBPATHS} ; do \ DESTDIR=`echo $${LIBPATH} | sed "s,^$(STAGING_DIR)/,," | xargs dirname` ; \ mkdir -p $(TARGET_DIR)/$${DESTDIR}; \ diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index ada767e..d62e2cf 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -387,8 +387,8 @@ endef ifeq ($(BR2_STATIC_LIBS),) define TOOLCHAIN_EXTERNAL_INSTALL_TARGET_LIBS $(Q)$(call MESSAGE,"Copying external toolchain libraries to target...") - $(Q)for libs in $(TOOLCHAIN_EXTERNAL_LIBS); do \ - $(call copy_toolchain_lib_root,$$libs); \ + $(Q)for libpattern in $(TOOLCHAIN_EXTERNAL_LIBS); do \ + $(call copy_toolchain_lib_root,$$libpattern); \ done endef endif -- 2.10.2