Commit 186a99b1 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

toolchain: modify the wildcard logic for shared libraries copying 



Until now, the copy_toolchain_lib_root function took as argument the
base name of a library (e.g: libm.so), and was assuming that the usual
scheme libm.so.<x> being a symbolic link to the real library was used.

However, with musl based toolchains, the C library is named libc.so
directly, with no symbolic link at all. Therefore, this commit changes
the copy_toolchain_lib_root to move the responsibility of using a
wildcard or not after the library name the caller's responsibility.

So, all the existing LIB_EXTERNAL_LIBS values are modified to have a
.* at the end, so that the behavior is effectively unchanged.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 36ef1b44

package/glibc/glibc.mk

+4 −4
Original line number Diff line number Diff line
@@ -112,12 +112,12 @@ endef 
#



GLIBC_LIBS_LIB = \

	ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so	   \

	libnsl.so libpthread.so libresolv.so librt.so libutil.so   \

	libnss_files.so libnss_dns.so

	ld*.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.*        \

	libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* libutil.so.*   \

	libnss_files.so.* libnss_dns.so.*



ifeq ($(BR2_PACKAGE_GDB_SERVER),y)

GLIBC_LIBS_LIB += libthread_db.so

GLIBC_LIBS_LIB += libthread_db.so.*

endif



define GLIBC_INSTALL_TARGET_CMDS

toolchain/helpers.mk

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ copy_toolchain_lib_root = \ 
		$${ARCH_SYSROOT_DIR}/$${ARCH_LIB_DIR} \

		$${ARCH_SYSROOT_DIR}/usr/$${ARCH_LIB_DIR} \

		$${SUPPORT_LIB_DIR} ; do \

		LIBSPATH=`find $${dir} -maxdepth 1 -name "$${LIB}.*" 2>/dev/null` ; \

		LIBSPATH=`find $${dir} -maxdepth 1 -name "$${LIB}" 2>/dev/null` ; \

		if test -n "$${LIBSPATH}" ; then \

			break ; \

		fi \

toolchain/toolchain-external/toolchain-external.mk

+5 −5
Original line number Diff line number Diff line
@@ -55,21 +55,21 @@ 
#  of Buildroot is handled identical for the 2 toolchain types.



ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y)

LIB_EXTERNAL_LIBS+=ld*.so libc.so libcrypt.so libdl.so libgcc_s.so libm.so libnsl.so libresolv.so librt.so libutil.so

LIB_EXTERNAL_LIBS+=ld*.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* libm.so.* libnsl.so.* libresolv.so.* librt.so.* libutil.so.*

ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)

LIB_EXTERNAL_LIBS+=libpthread.so

LIB_EXTERNAL_LIBS+=libpthread.so.*

ifneq ($(BR2_PACKAGE_GDB_SERVER)$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY),)

LIB_EXTERNAL_LIBS+=libthread_db.so

LIB_EXTERNAL_LIBS+=libthread_db.so.*

endif # gdbserver

endif # ! no threads

endif



ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y)

LIB_EXTERNAL_LIBS+=libnss_files.so libnss_dns.so

LIB_EXTERNAL_LIBS+=libnss_files.so.* libnss_dns.so.*

endif



ifeq ($(BR2_INSTALL_LIBSTDCPP),y)

USR_LIB_EXTERNAL_LIBS+=libstdc++.so

USR_LIB_EXTERNAL_LIBS+=libstdc++.so.*

endif



LIB_EXTERNAL_LIBS+=$(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS))