pick

diff --git a/meta b/meta
index 56da2bf89f77a90bee9c9e0942230a3385b957ee..a60195c1316e0b2e2dc4a8256e08b39b68e85e5a 100644 (file)
--- a/meta
+++ b/meta
@@ -1,7 +1,8 @@
 Version: 1
-Previous: e3fb6e897842452639e4f9ffaa0d04c226ab6ab9
-Head: e874a7ab9111f9bae8f83a95a3717446ce19715f
+Previous: 7db0666063f9325c4d15e2f9eb2bc04b8d95eefa
+Head: ccf0b8b1f8276b1ca9f742a18ba94bbe4b17f093
 Applied:
+  ibacm-search-the-pthread-and-d: ccf0b8b1f8276b1ca9f742a18ba94bbe4b17f093
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/ibacm-search-the-pthread-and-d b/patches/ibacm-search-the-pthread-and-d
new file mode 100644 (file)
index 0000000..3ddf90c
--- /dev/null
+++ b/patches/ibacm-search-the-pthread-and-d
@@ -0,0 +1,42 @@
+Bottom: 2b8870d416096866fa7415739d3e2f4cbb1db320
+Top:    989ff3790414f79d1d5f48618310870be6cb70e5
+Author: John Fleck <john.fleck@intel.com>
+Date:   2014-12-15 10:43:25 -0500
+
+ibacm: Search the pthread and dynamic linker/loader library when linking.
+
+When building with RHEL 7, there is an undefined reference to the pthread
+and the dynamic linker/loader libraries.
+
+
+---
+
+diff --git a/Makefile.am b/Makefile.am
+index c71ed7c..73b1a31 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,7 @@
+ AM_CPPFLAGS = -I$(srcdir)/include -I$(srcdir)/linux -I$(srcdir)/src
+ 
+ AM_CFLAGS = -g -Wall -D_GNU_SOURCE 
++AM_LDFLAGS = -lpthread -ldl
+ 
+ if HAVE_LD_VERSION_SCRIPT
+     libibacmp_version_script = -Wl,--version-script=$(srcdir)/prov/acmp/src/libibacmp.map
+@@ -13,14 +14,14 @@ sbin_PROGRAMS = svc/ibacm
+ svc_ibacm_SOURCES = src/acm.c src/acm_util.c
+ util_ib_acme_SOURCES = src/acme.c src/libacm.c linux/libacm_linux.c src/parse.c
+ svc_ibacm_CFLAGS = $(AM_CFLAGS)
+-svc_ibacm_LDFLAGS = -rdynamic
++svc_ibacm_LDFLAGS = -rdynamic $(AM_LDFLAGS)
+ util_ib_acme_CFLAGS = $(AM_CFLAGS) -DACME_PRINTS
+ 
+ pkglib_LTLIBRARIES = lib/libibacmp.la
+ lib_libibacmp_la_CFLAGS = $(AM_CFLAGS) 
+ lib_libibacmp_la_SOURCES = prov/acmp/src/acmp.c  
+ lib_libibacmp_la_LDFLAGS = -version-info 1 -export-dynamic \
+-                         $(libibacmp_version_script)
++                         $(libibacmp_version_script) $(AM_LDFLAGS)
+ lib_libibacmp_la_DEPENDENCIES =  $(srcdir)/prov/acmp/src/libibacmp.map
+ 
+ ibacmincludedir = $(includedir)/infiniband