diff mbox

[06/20] busybox: add support to link against libtirpc when available

Message ID 982e7938fd23732ce642ef91ecdc26b0f073b4c7.1344706801.git.thomas.petazzoni@free-electrons.com
State RFC
Headers show

Commit Message

Thomas Petazzoni Aug. 11, 2012, 5:40 p.m. UTC 
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 package/busybox/busybox.mk |   20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

Comments

Yann E. MORIN Aug. 12, 2012, 3:51 p.m. UTC | #1 
Thomas, All,

On Saturday 11 August 2012 19:40:38 Thomas Petazzoni wrote:
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
>  package/busybox/busybox.mk |   20 +++++++++++++++++---
>  1 file changed, 17 insertions(+), 3 deletions(-)
> 
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> index 7277301..17c8317 100644
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -12,14 +12,28 @@ BUSYBOX_VERSION = $(call qstrip,$(BR2_BUSYBOX_VERSION))
>  BUSYBOX_SITE = http://www.busybox.net/downloads
>  endif
>  BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
> +
> +BUSYBOX_CFLAGS = \
> +	$(TARGET_CFLAGS) \
> +	-I$(LINUX_HEADERS_DIR)/include
> +
> +BUSYBOX_LDFLAGS = \
> +	$(TARGET_LDFLAGS)
> +
> +ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
> +BUSYBOX_DEPENDENCIES += libtirpc
> +BUSYBOX_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc/
> +BUSYBOX_LDFLAGS += -ltirpc
> +endif
> +
>  BUSYBOX_BUILD_CONFIG = $(BUSYBOX_DIR)/.config
>  # Allows the build system to tweak CFLAGS
> -BUSYBOX_MAKE_ENV = $(TARGET_MAKE_ENV) CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_HEADERS_DIR)/include"
> +BUSYBOX_MAKE_ENV = $(TARGET_MAKE_ENV) CFLAGS="$(BUSYBOX_CFLAGS)"
>  BUSYBOX_MAKE_OPTS = \
>  	CC="$(TARGET_CC)" \
>  	ARCH=$(KERNEL_ARCH) \
>  	PREFIX="$(TARGET_DIR)" \
> -	EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
> +	EXTRA_LDFLAGS="$(BUSYBOX_LDFLAGS)" \
>  	CROSS_COMPILE="$(TARGET_CROSS)" \
>  	CONFIG_PREFIX="$(TARGET_DIR)" \
>  	SKIP_STRIP=y
> @@ -79,7 +93,7 @@ endef
>  endif
>  
>  # If RPC is enabled then enable nfs mounts
> -ifeq ($(BR2_TOOLCHAIN_HAS_NATIVE_RPC),y)
> +ifeq ($(BR2_RPC_AVAILABLE),y)

BR2_RPC_SUPPORT_AVAILABLE

>  define BUSYBOX_SET_RPC
>  	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MOUNT_NFS,$(BUSYBOX_BUILD_CONFIG))
>  endef
> -- 
> 1.7.9.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
> 
>
Arnout Vandecappelle Aug. 28, 2012, 5:51 p.m. UTC | #2 
On 08/12/12 17:51, Yann E. MORIN wrote:
> On Saturday 11 August 2012 19:40:38 Thomas Petazzoni wrote:
> >    # If RPC is enabled then enable nfs mounts
> >  -ifeq ($(BR2_TOOLCHAIN_HAS_NATIVE_RPC),y)
> >  +ifeq ($(BR2_RPC_AVAILABLE),y)
> BR2_RPC_SUPPORT_AVAILABLE


  But maybe BR2_RPC_AVAILABLE is a better name :-)

  Regards,
  Arnout
diff mbox

Patch

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 7277301..17c8317 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -12,14 +12,28 @@  BUSYBOX_VERSION = $(call qstrip,$(BR2_BUSYBOX_VERSION))
 BUSYBOX_SITE = http://www.busybox.net/downloads
 endif
 BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2
+
+BUSYBOX_CFLAGS = \
+	$(TARGET_CFLAGS) \
+	-I$(LINUX_HEADERS_DIR)/include
+
+BUSYBOX_LDFLAGS = \
+	$(TARGET_LDFLAGS)
+
+ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
+BUSYBOX_DEPENDENCIES += libtirpc
+BUSYBOX_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc/
+BUSYBOX_LDFLAGS += -ltirpc
+endif
+
 BUSYBOX_BUILD_CONFIG = $(BUSYBOX_DIR)/.config
 # Allows the build system to tweak CFLAGS
-BUSYBOX_MAKE_ENV = $(TARGET_MAKE_ENV) CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_HEADERS_DIR)/include"
+BUSYBOX_MAKE_ENV = $(TARGET_MAKE_ENV) CFLAGS="$(BUSYBOX_CFLAGS)"
 BUSYBOX_MAKE_OPTS = \
 	CC="$(TARGET_CC)" \
 	ARCH=$(KERNEL_ARCH) \
 	PREFIX="$(TARGET_DIR)" \
-	EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \
+	EXTRA_LDFLAGS="$(BUSYBOX_LDFLAGS)" \
 	CROSS_COMPILE="$(TARGET_CROSS)" \
 	CONFIG_PREFIX="$(TARGET_DIR)" \
 	SKIP_STRIP=y
@@ -79,7 +93,7 @@  endef
 endif
 
 # If RPC is enabled then enable nfs mounts
-ifeq ($(BR2_TOOLCHAIN_HAS_NATIVE_RPC),y)
+ifeq ($(BR2_RPC_AVAILABLE),y)
 define BUSYBOX_SET_RPC
 	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MOUNT_NFS,$(BUSYBOX_BUILD_CONFIG))
 endef