Merge from bittboy/buildroot@db180c0

package/openipmi/0001-Avoid-searching-host-library-path.patch

@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Wed, 22 Jul 2015 07:04:33 +0300
+Subject: [PATCH] Avoid searching host library path
+
+The $(libdir) variable points to the location of the directory on the target
+system, /usr/lib by default. When cross compiling this directory contains the
+host libraries which may be different than target libraries. Don't use
+$(libdir) in the library search path.
+
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+---
+ cmdlang/Makefile.am | 3 +--
+ unix/Makefile.am    | 6 ++----
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am
+index 264ee12be79f..0b3843784656 100644
+--- a/cmdlang/Makefile.am
++++ b/cmdlang/Makefile.am
+@@ -15,8 +15,7 @@ libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \
+ libOpenIPMIcmdlang_la_LIBADD = -lm \
+ 	$(top_builddir)/utils/libOpenIPMIutils.la \
+ 	$(top_builddir)/lib/libOpenIPMI.la
+-libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
+-	-L$(libdir)
++libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION)
+ 
+ bin_PROGRAMS = openipmish
+ 
+diff --git a/unix/Makefile.am b/unix/Makefile.am
+index 5128839dad13..bd0f897ba8d6 100644
+--- a/unix/Makefile.am
++++ b/unix/Makefile.am
+@@ -10,14 +10,12 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la
+ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c
+ libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \
+ 	$(top_builddir)/utils/libOpenIPMIutils.la $(RT_LIB)
+-libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
+-	-L$(libdir)
++libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION)
+ 
+ libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c
+ libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \
+ 	$(GDBM_LIB) $(RT_LIB)
+-libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
+-	-L$(libdir)
++libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION)
+ 
+ noinst_HEADERS = heap.h
+ 

package/openipmi/Config.in

@@ -0,0 +1,18 @@
+config BR2_PACKAGE_OPENIPMI
+	bool "openipmi"
+	depends on BR2_USE_MMU # fork()
+	depends on !BR2_STATIC_LIBS # dlopen()
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	select BR2_PACKAGE_POPT
+	select BR2_PACKAGE_NCURSES
+	help
+	  IPMI allows remote monitoring and remote management of
+	  devices. OpenIPMI provides a library and command line tools
+	  to interact with IPMI enabled devices. OpenIPMI also provides
+	  an IPMI BMC simulator.
+
+	  http://openipmi.sourceforge.net
+
+comment "openipmi needs a toolchain w/ dynamic library, NPTL"
+	depends on BR2_USE_MMU
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL

package/openipmi/openipmi.hash

@@ -0,0 +1,4 @@
+# From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/
+sha1 f37656813a826a3147ed557c32408f8daa399c28 OpenIPMI-2.0.24.tar.gz
+# Locally computed
+sha256	bca39a27071278a8b74610181ede8df51e155e5e9031bc8eaa3699d1720292b4	OpenIPMI-2.0.24.tar.gz

package/openipmi/openipmi.mk

@@ -0,0 +1,41 @@
+################################################################################
+#
+# openipmi
+#
+################################################################################
+
+OPENIPMI_VERSION = 2.0.24
+OPENIPMI_SITE = http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library
+OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz
+OPENIPMI_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-3-Clause
+OPENIPMI_LICENSE_FILES = COPYING.LIB COPYING COPYING.BSD
+OPENIPMI_DEPENDENCIES = popt ncurses host-pkgconf
+# Patching Makefile.am
+OPENIPMI_AUTORECONF = YES
+OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)"
+OPENIPMI_CONF_OPTS = \
+	--with-glib=no \
+	--with-tcl=no \
+	--with-perl=no \
+	--with-python=no \
+	--with-swig=no
+
+ifeq ($(BR2_PACKAGE_GDBM),y)
+OPENIPMI_DEPENDENCIES += gdbm
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+OPENIPMI_DEPENDENCIES += openssl
+OPENIPMI_CONF_OPTS += --with-openssl=yes
+else
+OPENIPMI_CONF_OPTS += --with-openssl=no
+endif
+
+ifeq ($(BR2_PACKAGE_NETSNMP),y)
+OPENIPMI_DEPENDENCIES += netsnmp
+OPENIPMI_CONF_OPTS += --with-ucdsnmp=yes
+else
+OPENIPMI_CONF_OPTS += --with-ucdsnmp=no
+endif
+
+$(eval $(autotools-package))