X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=package%2Ftoolchain%2FMakefile;h=202e9d095d6c4b9d1f1f348603e0df1fdc30f5a4;hb=1822375c7c5caa5d7a8622a9f9f95250c92a31aa;hp=84fc3e6b2fca588e731ad1bf83e601328edc9af3;hpb=cfcc935fa2f110fdf4824c67d3cd67f34d91f7a8;p=openwrt.git diff --git a/package/toolchain/Makefile b/package/toolchain/Makefile index 84fc3e6b2f..202e9d095d 100644 --- a/package/toolchain/Makefile +++ b/package/toolchain/Makefile @@ -34,19 +34,19 @@ endef define Package/libgcc/config menu "Configuration" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libgcc + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgcc config LIBGCC_ROOT_DIR string prompt "libgcc shared library base directory" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libgcc + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgcc default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN default "/" if NATIVE_TOOLCHAIN config LIBGCC_FILE_SPEC string prompt "libgcc shared library files (use wildcards)" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libgcc + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgcc default "./lib/libgcc_s.so.*" endmenu @@ -61,19 +61,19 @@ endef define Package/libssp/config menu "Configuration" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libssp + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libssp config LIBSSP_ROOT_DIR string prompt "libssp shared library base directory" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libssp + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libssp default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN default "/" if NATIVE_TOOLCHAIN config LIBSSP_FILE_SPEC string prompt "libssp shared library files (use wildcards)" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libssp + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libssp default "./lib/libssp.so.*" endmenu @@ -84,24 +84,23 @@ define Package/libstdcpp $(call Package/gcc/Default) NAME:=libstdc++ TITLE:=GNU Standard C++ Library v3 - DEPENDS+=@INSTALL_LIBSTDCPP endef define Package/libstdcpp/config menu "Configuration" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp config LIBSTDCPP_ROOT_DIR string prompt "libstdcpp shared library base directory" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN default "/" if NATIVE_TOOLCHAIN config LIBSTDCPP_FILE_SPEC string prompt "libstdc++ shared library files (use wildcards)" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libstdcpp default "./lib/libstdc++.so.*" endmenu @@ -125,19 +124,19 @@ endef define Package/libc/config menu "Configuration" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libc + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libc config LIBC_ROOT_DIR string prompt "libc shared library base directory" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libc + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libc default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN default "/" if NATIVE_TOOLCHAIN config LIBC_FILE_SPEC string prompt "libc shared library files (use wildcards)" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libc + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libc default "./lib/ld{-*.so,-linux*.so.*} ./lib/lib{anl,c,cidn,crypt,dl,m,nsl,nss_dns,nss_files,resolv,util}{-*.so,.so.*}" endmenu @@ -151,19 +150,19 @@ endef define Package/libpthread/config menu "Configuration" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libpthread + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libpthread config LIBPTHREAD_ROOT_DIR string prompt "libpthread shared library base directory" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libpthread + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libpthread default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN default "/" if NATIVE_TOOLCHAIN config LIBPTHREAD_FILE_SPEC string prompt "libpthread shared library files (use wildcards)" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libpthread + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libpthread default "./lib/libpthread{-*.so,.so.*}" endmenu @@ -172,6 +171,7 @@ endef define Package/libthread-db $(call Package/libc/Default) + DEPENDS:=@!USE_MUSL TITLE:=POSIX thread library debugging support endef @@ -183,19 +183,19 @@ endef define Package/librt/config menu "Configuration" - depends EXTERNAL_TOOLCHAIN && PACKAGE_librt + depends on EXTERNAL_TOOLCHAIN && PACKAGE_librt config LIBRT_ROOT_DIR string prompt "librt shared library base directory" - depends EXTERNAL_TOOLCHAIN && PACKAGE_librt + depends on EXTERNAL_TOOLCHAIN && PACKAGE_librt default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN default "/" if NATIVE_TOOLCHAIN config LIBRT_FILE_SPEC string prompt "librt shared library files (use wildcards)" - depends EXTERNAL_TOOLCHAIN && PACKAGE_librt + depends on EXTERNAL_TOOLCHAIN && PACKAGE_librt default "./lib/librt{-*.so,.so.*}" endmenu @@ -210,19 +210,19 @@ endef define Package/libgfortran/config menu "Configuration" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran config LIBGFORTRAN_ROOT_DIR string prompt "libgfortran shared library base directory" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN default "/" if NATIVE_TOOLCHAIN config LIBGFORTRAN_FILE_SPEC string prompt "libgfortran shared library files (use wildcards)" - depends EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran + depends on EXTERNAL_TOOLCHAIN && PACKAGE_libgfortran default "./usr/lib/libgfortran.so.*" endmenu @@ -230,6 +230,7 @@ endef define Package/ldd $(call Package/libc/Default) + DEPENDS:=@!USE_MUSL SECTION:=utils CATEGORY:=Utilities TITLE:=LDD trace utility @@ -237,19 +238,19 @@ endef define Package/ldd/config menu "Configuration" - depends EXTERNAL_TOOLCHAIN && PACKAGE_ldd + depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldd config LDD_ROOT_DIR string prompt "ldd trace utility base directory" - depends EXTERNAL_TOOLCHAIN && PACKAGE_ldd + depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldd default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN default "/" if NATIVE_TOOLCHAIN config LDD_FILE_SPEC string prompt "ldd trace utility file" - depends EXTERNAL_TOOLCHAIN && PACKAGE_ldd + depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldd default "./usr/bin/ldd" endmenu @@ -258,6 +259,7 @@ endef define Package/ldconfig $(call Package/libc/Default) + DEPENDS:=@!USE_MUSL SECTION:=utils CATEGORY:=Utilities TITLE:=Shared library path configuration @@ -265,19 +267,19 @@ endef define Package/ldconfig/config menu "Configuration" - depends EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig + depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig config LDCONFIG_ROOT_DIR string prompt "ldconfig base directory" - depends EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig + depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig default TOOLCHAIN_ROOT if !NATIVE_TOOLCHAIN default "/" if NATIVE_TOOLCHAIN config LDCONFIG_FILE_SPEC string prompt "ldconfig file" - depends EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig + depends on EXTERNAL_TOOLCHAIN && PACKAGE_ldconfig default "./sbin/ldconfig" endmenu @@ -451,6 +453,7 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) define Package/libpthread/install $(INSTALL_DIR) $(1)/lib + ifneq ($(CONFIG_USE_MUSL),y) $(CP) \ $(TOOLCHAIN_DIR)/lib/libpthread.so.* \ $(if $(BUILD_LIBGCC),\ @@ -458,6 +461,7 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so \ ) \ $(1)/lib/ + endif endef define Package/libthread-db/install @@ -477,10 +481,12 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) define Package/librt/install $(INSTALL_DIR) $(1)/lib + ifneq ($(CONFIG_USE_MUSL),y) $(CP) \ $(TOOLCHAIN_DIR)/lib/librt.so.* \ $(TOOLCHAIN_DIR)/lib/librt-$(LIBC_SO_VERSION).so \ $(1)/lib/ + endif endef define Package/ldd/install