From 80f7a4b6797d11fbf3808a8af8b5e5f58048f117 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 4 Nov 2012 07:34:12 +0000 Subject: [PATCH] lmbench: add support to use libtirpc when available Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/lmbench/Config.in | 6 +----- package/lmbench/lmbench.mk | 11 ++++++++++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/package/lmbench/Config.in b/package/lmbench/Config.in index 70449b63b2..d710e1ffff 100644 --- a/package/lmbench/Config.in +++ b/package/lmbench/Config.in @@ -1,12 +1,8 @@ config BR2_PACKAGE_LMBENCH bool "lmbench" - # Uses pmap_set, pmap__unset, pmap_getport, etc. - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC + select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC help LMbench is a suite of simple, portable, ANSI/C microbenchmarks for UNIX/POSIX. http://sourceforge.net/projects/lmbench/ - -comment "lmbench requires a toolchain with RPC support" - depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC diff --git a/package/lmbench/lmbench.mk b/package/lmbench/lmbench.mk index d3d0f8f779..1932adbfb3 100644 --- a/package/lmbench/lmbench.mk +++ b/package/lmbench/lmbench.mk @@ -9,6 +9,15 @@ LMBENCH_SITE:=http://downloads.sourceforge.net/project/lmbench/development/lmben LMBENCH_LICENSE = lmbench license (based on GPLv2) LMBENCH_LICENSE_FILES = COPYING COPYING-2 +LMBENCH_CFLAGS = $(TARGET_CFLAGS) +LMBENCH_LDLIBS = $(TARGET_LDFLAGS) + +ifeq ($(BR2_PACKAGE_LIBTIRPC),y) +LMBENCH_DEPENDENCIES += libtirpc +LMBENCH_CFLAGS += -I$(STAGING_DIR)/usr/include/tirpc/ +LMBENCH_LDFLAGS += -ltirpc +endif + define LMBENCH_CONFIGURE_CMDS $(call CONFIG_UPDATE,$(@D)) sed -i 's/CFLAGS=/CFLAGS+=/g' $(@D)/src/Makefile @@ -18,7 +27,7 @@ define LMBENCH_CONFIGURE_CMDS endef define LMBENCH_BUILD_CMDS - $(MAKE) CFLAGS="$(TARGET_CFLAGS)" OS=$(ARCH) CC="$(TARGET_CC)" -C $(@D)/src + $(MAKE) CFLAGS="$(LMBENCH_CFLAGS)" LDFLAGS="$(LMBENCH_LDFLAGS)" OS=$(ARCH) CC="$(TARGET_CC)" -C $(@D)/src endef define LMBENCH_INSTALL_TARGET_CMDS