Rename BR2_INET_RPC to BR2_TOOLCHAIN_HAS_NATIVE_RPC

The BR2_INET_RPC has for a long time been a not very descriptive
configuration option name, and with the advent of non-RPC glibc
toolchains and the apparition of libtirpc, we really need to rename it
to something more sensible, BR2_TOOLCHAIN_HAS_NATIVE_RPC.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Thomas Petazzoni
2012-11-03 18:47:49 +01:00
committed by Peter Korsgaard
parent 97a3f9e94c
commit 0858e000fe
14 changed files with 36 additions and 32 deletions

View File

@@ -1,7 +1,7 @@
config BR2_PACKAGE_LMBENCH config BR2_PACKAGE_LMBENCH
bool "lmbench" bool "lmbench"
# Uses pmap_set, pmap__unset, pmap_getport, etc. # Uses pmap_set, pmap__unset, pmap_getport, etc.
depends on BR2_INET_RPC depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
help help
LMbench is a suite of simple, portable, LMbench is a suite of simple, portable,
ANSI/C microbenchmarks for UNIX/POSIX. ANSI/C microbenchmarks for UNIX/POSIX.
@@ -9,4 +9,4 @@ config BR2_PACKAGE_LMBENCH
http://sourceforge.net/projects/lmbench/ http://sourceforge.net/projects/lmbench/
comment "lmbench requires a toolchain with RPC support" comment "lmbench requires a toolchain with RPC support"
depends on !BR2_INET_RPC depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC

View File

@@ -1,10 +1,10 @@
config BR2_PACKAGE_NETKITBASE config BR2_PACKAGE_NETKITBASE
bool "netkitbase" bool "netkitbase"
depends on BR2_INET_RPC depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
help help
Old-style inetd. Old-style inetd.
ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/ ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
comment "netkitbase requires a toolchain with RPC support" comment "netkitbase requires a toolchain with RPC support"
depends on !BR2_INET_RPC depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC

View File

@@ -1,6 +1,6 @@
config BR2_PACKAGE_NETKITTELNET config BR2_PACKAGE_NETKITTELNET
bool "netkittelnet" bool "netkittelnet"
depends on BR2_INET_RPC depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_PACKAGE_NETKITBASE select BR2_PACKAGE_NETKITBASE
help help
Standard Linux telnet client and server. Standard Linux telnet client and server.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_NETKITTELNET
ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/ ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
comment "netkittelnet requires a toolchain with RPC support" comment "netkittelnet requires a toolchain with RPC support"
depends on !BR2_INET_RPC depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC

View File

@@ -1,6 +1,6 @@
config BR2_PACKAGE_NFS_UTILS config BR2_PACKAGE_NFS_UTILS
bool "nfs-utils" bool "nfs-utils"
depends on BR2_INET_RPC depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
depends on BR2_LARGEFILE depends on BR2_LARGEFILE
select BR2_PACKAGE_PORTMAP select BR2_PACKAGE_PORTMAP
help help
@@ -11,7 +11,7 @@ config BR2_PACKAGE_NFS_UTILS
http://sourceforge.net/projects/nfs http://sourceforge.net/projects/nfs
comment "nfs-utils requires a toolchain with RPC and LARGEFILE support" comment "nfs-utils requires a toolchain with RPC and LARGEFILE support"
depends on !BR2_INET_RPC || !BR2_LARGEFILE depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_LARGEFILE
menu "NFS utilities selection" menu "NFS utilities selection"
depends on BR2_PACKAGE_NFS_UTILS depends on BR2_PACKAGE_NFS_UTILS

View File

@@ -1,10 +1,10 @@
config BR2_PACKAGE_PORTMAP config BR2_PACKAGE_PORTMAP
bool "portmap" bool "portmap"
depends on BR2_INET_RPC depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
help help
The standard portmapper for RPC services. The standard portmapper for RPC services.
http://neil.brown.name/portmap/ http://neil.brown.name/portmap/
comment "portmap requires a toolchain with RPC support" comment "portmap requires a toolchain with RPC support"
depends on !BR2_INET_RPC depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC

View File

@@ -1,6 +1,6 @@
config BR2_PACKAGE_QUOTA config BR2_PACKAGE_QUOTA
bool "quota" bool "quota"
depends on BR2_INET_RPC depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
depends on BR2_LARGEFILE depends on BR2_LARGEFILE
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX
@@ -12,4 +12,4 @@ config BR2_PACKAGE_QUOTA
http://sourceforge.net/projects/linuxquota/ http://sourceforge.net/projects/linuxquota/
comment "quota requires a toolchain with RPC + LARGEFILE + WCHAR support" comment "quota requires a toolchain with RPC + LARGEFILE + WCHAR support"
depends on !(BR2_INET_RPC && BR2_LARGEFILE && BR2_USE_WCHAR) depends on !(BR2_TOOLCHAIN_HAS_NATIVE_RPC && BR2_LARGEFILE && BR2_USE_WCHAR)

View File

@@ -51,7 +51,7 @@ SAMBA_CONF_OPT = \
\ \
--without-cluster-support \ --without-cluster-support \
--without-dnsupdate \ --without-dnsupdate \
$(if $(BR2_INET_RPC),--with-sys-quotas,--without-sys-quotas) \ $(if $(BR2_TOOLCHAIN_HAS_NATIVE_RPC),--with-sys-quotas,--without-sys-quotas) \
--without-ads \ --without-ads \
--without-ldap \ --without-ldap \
--with-included-iniparser \ --with-included-iniparser \

View File

@@ -9,7 +9,7 @@ XINETD_SITE = http://www.xinetd.org
XINETD_LICENSE = xinetd license XINETD_LICENSE = xinetd license
XINETD_LICENSE_FILES = COPYRIGHT XINETD_LICENSE_FILES = COPYRIGHT
ifneq ($(BR2_INET_RPC),y) ifneq ($(BR2_TOOLCHAIN_HAS_NATIVE_RPC),y)
XINETD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DNO_RPC" XINETD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DNO_RPC"
endif endif

View File

@@ -202,7 +202,7 @@ check_glibc = \
fi; \ fi; \
$(call check_glibc_feature,BR2_LARGEFILE,Large file support) ;\ $(call check_glibc_feature,BR2_LARGEFILE,Large file support) ;\
$(call check_glibc_feature,BR2_INET_IPV6,IPv6 support) ;\ $(call check_glibc_feature,BR2_INET_IPV6,IPv6 support) ;\
$(call check_glibc_feature,BR2_INET_RPC,RPC support) ;\ $(call check_glibc_feature,BR2_TOOLCHAIN_HAS_NATIVE_RPC,RPC support) ;\
$(call check_glibc_feature,BR2_ENABLE_LOCALE,Locale support) ;\ $(call check_glibc_feature,BR2_ENABLE_LOCALE,Locale support) ;\
$(call check_glibc_feature,BR2_USE_MMU,MMU support) ;\ $(call check_glibc_feature,BR2_USE_MMU,MMU support) ;\
$(call check_glibc_feature,BR2_USE_WCHAR,Wide char support) $(call check_glibc_feature,BR2_USE_WCHAR,Wide char support)
@@ -248,7 +248,7 @@ check_uclibc = \
$(call check_uclibc_feature,__ARCH_USE_MMU__,BR2_USE_MMU,$${UCLIBC_CONFIG_FILE},MMU support) ;\ $(call check_uclibc_feature,__ARCH_USE_MMU__,BR2_USE_MMU,$${UCLIBC_CONFIG_FILE},MMU support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_LFS__,BR2_LARGEFILE,$${UCLIBC_CONFIG_FILE},Large file support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_LFS__,BR2_LARGEFILE,$${UCLIBC_CONFIG_FILE},Large file support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,BR2_INET_IPV6,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,BR2_INET_IPV6,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_INET_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_TOOLCHAIN_HAS_NATIVE_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_THREADS__,BR2_TOOLCHAIN_HAS_THREADS,$${UCLIBC_CONFIG_FILE},Thread support) ;\ $(call check_uclibc_feature,__UCLIBC_HAS_THREADS__,BR2_TOOLCHAIN_HAS_THREADS,$${UCLIBC_CONFIG_FILE},Thread support) ;\

View File

@@ -20,7 +20,7 @@ config BR2_TOOLCHAIN_BUILDROOT_INET_IPV6
config BR2_TOOLCHAIN_BUILDROOT_INET_RPC config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
bool "Enable RPC support" bool "Enable RPC support"
select BR2_INET_RPC select BR2_TOOLCHAIN_HAS_NATIVE_RPC
help help
Enable this option if you want your toolchain to support Enable this option if you want your toolchain to support
RPC (needed for NFS, for example). RPC (needed for NFS, for example).

View File

@@ -11,7 +11,7 @@ config BR2_LARGEFILE
config BR2_INET_IPV6 config BR2_INET_IPV6
bool bool
config BR2_INET_RPC config BR2_TOOLCHAIN_HAS_NATIVE_RPC
bool bool
config BR2_USE_WCHAR config BR2_USE_WCHAR

View File

@@ -14,7 +14,9 @@ config BR2_TOOLCHAIN_CTNG_eglibc
bool "eglibc" bool "eglibc"
select BR2_LARGEFILE select BR2_LARGEFILE
select BR2_INET_IPV6 select BR2_INET_IPV6
select BR2_INET_RPC # Our default ct-ng configuration uses eglibc 2.12, which has
# native RPC support
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_ENABLE_LOCALE select BR2_ENABLE_LOCALE
select BR2_USE_WCHAR select BR2_USE_WCHAR
@@ -22,7 +24,9 @@ config BR2_TOOLCHAIN_CTNG_glibc
bool "glibc" bool "glibc"
select BR2_LARGEFILE select BR2_LARGEFILE
select BR2_INET_IPV6 select BR2_INET_IPV6
select BR2_INET_RPC # Our default ct-ng configuration uses glibc 2.9, which has
# native RPC support
select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_ENABLE_LOCALE select BR2_ENABLE_LOCALE
select BR2_USE_WCHAR select BR2_USE_WCHAR
@@ -66,7 +70,7 @@ config BR2_TOOLCHAIN_CTNG_uClibc_INET_IPV6
config BR2_TOOLCHAIN_CTNG_uClibc_INET_RPC config BR2_TOOLCHAIN_CTNG_uClibc_INET_RPC
bool "Enable RPC support" bool "Enable RPC support"
select BR2_INET_RPC select BR2_TOOLCHAIN_HAS_NATIVE_RPC
help help
Enable this option if you want your toolchain to support Enable this option if you want your toolchain to support
RPC (needed for NFS, for example). RPC (needed for NFS, for example).

View File

@@ -450,7 +450,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
depends on BR2_sh2a depends on BR2_sh2a
select BR2_TOOLCHAIN_EXTERNAL_UCLIBC select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
select BR2_LARGEFILE select BR2_LARGEFILE
select BR2_INET_RPC select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_USE_WCHAR select BR2_USE_WCHAR
select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS
select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
@@ -467,7 +467,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
depends on BR2_sh2a depends on BR2_sh2a
select BR2_TOOLCHAIN_EXTERNAL_UCLIBC select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
select BR2_LARGEFILE select BR2_LARGEFILE
select BR2_INET_RPC select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_USE_WCHAR select BR2_USE_WCHAR
select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS
select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
@@ -528,7 +528,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R1
select BR2_INSTALL_LIBSTDCPP select BR2_INSTALL_LIBSTDCPP
select BR2_LARGEFILE select BR2_LARGEFILE
select BR2_INET_IPV6 select BR2_INET_IPV6
select BR2_INET_RPC select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_USE_WCHAR select BR2_USE_WCHAR
select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS
select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
@@ -543,7 +543,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2011R1
select BR2_INSTALL_LIBSTDCPP select BR2_INSTALL_LIBSTDCPP
select BR2_LARGEFILE select BR2_LARGEFILE
select BR2_INET_IPV6 select BR2_INET_IPV6
select BR2_INET_RPC select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_USE_WCHAR select BR2_USE_WCHAR
select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS
select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
@@ -558,7 +558,7 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2010RC1
select BR2_INSTALL_LIBSTDCPP select BR2_INSTALL_LIBSTDCPP
select BR2_LARGEFILE select BR2_LARGEFILE
select BR2_INET_IPV6 select BR2_INET_IPV6
select BR2_INET_RPC select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_USE_WCHAR select BR2_USE_WCHAR
select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS
select BR2_TOOLCHAIN_HAS_THREADS_DEBUG select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
@@ -678,7 +678,7 @@ config BR2_TOOLCHAIN_EXTERNAL_GLIBC
bool bool
select BR2_LARGEFILE select BR2_LARGEFILE
select BR2_INET_IPV6 select BR2_INET_IPV6
select BR2_INET_RPC select BR2_TOOLCHAIN_HAS_NATIVE_RPC
select BR2_USE_WCHAR select BR2_USE_WCHAR
select BR2_ENABLE_LOCALE select BR2_ENABLE_LOCALE
select BR2_TOOLCHAIN_HAS_THREADS select BR2_TOOLCHAIN_HAS_THREADS
@@ -732,7 +732,7 @@ config BR2_TOOLCHAIN_EXTERNAL_INET_IPV6
config BR2_TOOLCHAIN_EXTERNAL_INET_RPC config BR2_TOOLCHAIN_EXTERNAL_INET_RPC
bool "Toolchain has RPC support?" bool "Toolchain has RPC support?"
select BR2_INET_RPC select BR2_TOOLCHAIN_HAS_NATIVE_RPC
help help
Select this option if your external toolchain supports Select this option if your external toolchain supports
RPC. If you don't know, leave the default value, Buildroot RPC. If you don't know, leave the default value, Buildroot

View File

@@ -24,10 +24,10 @@
# the Buildroot configuration system knows whether the toolchain # the Buildroot configuration system knows whether the toolchain
# supports RPC, IPv6, locales, large files, etc. Unfortunately, these # supports RPC, IPv6, locales, large files, etc. Unfortunately, these
# things cannot be detected automatically, since the value of these # things cannot be detected automatically, since the value of these
# options (such as BR2_INET_RPC) are needed at configuration time # options (such as BR2_TOOLCHAIN_HAS_NATIVE_RPC) are needed at
# because these options are used as dependencies for other # configuration time because these options are used as dependencies
# options. And at configuration time, we are not able to retrieve the # for other options. And at configuration time, we are not able to
# external toolchain configuration. # retrieve the external toolchain configuration.
# #
# 3. Copy the libraries needed at runtime to the target directory, # 3. Copy the libraries needed at runtime to the target directory,
# $(TARGET_DIR). Obviously, things such as the C library, the dynamic # $(TARGET_DIR). Obviously, things such as the C library, the dynamic