build: consistently use 'depends on' instead of 'depends'

[15.05/openwrt.git] / package / toolchain / Makefile

diff --git a/package/toolchain/Makefile b/package/toolchain/Makefile
index 227f302..7eadaba 100644 (file)
--- a/package/toolchain/Makefile
+++ b/package/toolchain/Makefile
@@ -9,6 +9,8 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=toolchain
 PKG_RELEASE:=1
 
+PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
+
 include $(INCLUDE_DIR)/package.mk
 
 ifneq ($(DUMP),1)
@@ -28,24 +30,23 @@ endef
 define Package/libgcc
 $(call Package/gcc/Default)
   TITLE:=GCC support library
-  DEPENDS+=@!(TARGET_avr32||TARGET_coldfire)
 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
@@ -60,19 +61,19 @@ endef
 
 define Package/libssp/config
        menu "Configuration"
-               depends EXTERNAL_TOOLCHAIN && PACKAGE_libssp
+               depends on EXTERNAL_TOOLCHAIN && PACKAGE_libssp
 
-       config LIBSPP_ROOT_DIR
+       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
@@ -88,19 +89,19 @@ 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
@@ -111,9 +112,7 @@ define Package/libc/Default
   SECTION:=libs
   CATEGORY:=Base system
   VERSION:=$(LIBC_VERSION)-$(PKG_RELEASE)
-ifeq ($(TARGET_avr32)$(TARGET_coldfire),)
   DEPENDS:=+libgcc
-endif
   URL:=$(LIBC_URL)
   PKG_FLAGS:=hold essential
 endef
@@ -126,19 +125,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
@@ -152,25 +151,31 @@ 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
 endef
 
 
+define Package/libthread-db
+$(call Package/libc/Default)
+  DEPENDS:=@!USE_MUSL
+  TITLE:=POSIX thread library debugging support
+endef
+
 define Package/librt
 $(call Package/libc/Default)
   TITLE:=POSIX.1b RealTime extension library
@@ -179,19 +184,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
@@ -201,24 +206,24 @@ endef
 define Package/libgfortran
 $(call Package/gcc/Default)
   TITLE:=GFortran support library
-  DEPENDS+=@!(TARGET_avr32||TARGET_coldfire) @INSTALL_GFORTRAN
+  DEPENDS+=@INSTALL_GFORTRAN
 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
@@ -226,6 +231,7 @@ endef
 
 define Package/ldd
 $(call Package/libc/Default)
+  DEPENDS:=@!USE_MUSL
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=LDD trace utility
@@ -233,19 +239,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
@@ -254,6 +260,7 @@ endef
 
 define Package/ldconfig
 $(call Package/libc/Default)
+  DEPENDS:=@!USE_MUSL
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Shared library path configuration
@@ -261,19 +268,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
@@ -358,12 +365,12 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
 
   define Package/libgcc/install
        $(INSTALL_DIR) $(1)/lib
-       $(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/
+       $(if $(CONFIG_TARGET_avr32)$(CONFIG_TARGET_coldfire),,$(CP) $(TOOLCHAIN_DIR)/lib/libgcc_s.so.* $(1)/lib/)
   endef
 
   define Package/libgfortran/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(TOOLCHAIN_DIR)/lib/libgfortran.so.* $(1)/usr/lib/
+       $(if $(CONFIG_TARGET_avr32)$(CONFIG_TARGET_coldfire),,$(CP) $(TOOLCHAIN_DIR)/lib/libgfortran.so.* $(1)/usr/lib/)
   endef
 
   define Package/libssp/install
@@ -422,6 +429,16 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
                $(1)/lib/
   endef
 
+  define Package/musl/install
+       $(INSTALL_DIR) $(1)/lib
+       $(CP) \
+               $(TOOLCHAIN_DIR)/lib/ld-musl-*.so* \
+               $(1)/lib/
+       $(CP) \
+               $(TOOLCHAIN_DIR)/lib/libc.so* \
+               $(1)/lib/
+  endef
+
   define Package/libc/install
     $(call Package/$(LIBC)/install,$1)
   endef
@@ -437,6 +454,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),\
@@ -444,6 +462,18 @@ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
                        $(TOOLCHAIN_DIR)/lib/libpthread-$(LIBC_SO_VERSION).so \
                ) \
                $(1)/lib/
+  endif
+  endef
+
+  define Package/libthread-db/install
+       $(INSTALL_DIR) $(1)/lib
+       $(CP) \
+               $(TOOLCHAIN_DIR)/lib/libthread_db.so.* $(1)/lib
+  ifeq ($(USE_UCLIBC),y)
+       $(CP) \
+               $(TOOLCHAIN_DIR)/lib/libthread_db-$(LIBC_SO_VERSION).so \
+               $(1)/lib/
+  endif
   endef
 
   define Package/libpthread/install_lib
@@ -452,10 +482,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
@@ -557,6 +589,7 @@ $(eval $(call BuildPackage,libgcc))
 $(eval $(call BuildPackage,libssp))
 $(eval $(call BuildPackage,libstdcpp))
 $(eval $(call BuildPackage,libpthread))
+$(eval $(call BuildPackage,libthread-db))
 $(eval $(call BuildPackage,librt))
 $(eval $(call BuildPackage,libgfortran))
 $(eval $(call BuildPackage,ldd))