refresh

diff --git a/meta b/meta
index 23875a00d821f716ba5d950f9c188885f20ddc6c..1cc0f8965c2bbef409f05214723b765a0f0f4f17 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 737710deb36f1e3e2f99bb9550d1cd341deff2bd
-Head: 906279ec724cda7a619dc712141479adc26f9448
+Previous: d78afa5e2bfd6cc725cfb4ea645c10e326df27a5
+Head: 019c5fe4678f06b7f54ae83ee993707a15d417bf
 Applied:
-  build-preload: e90fdf7fc7a1f0a1068e625586808cd76baf3504
-  refresh-temp: 906279ec724cda7a619dc712141479adc26f9448
+  build-preload: 019c5fe4678f06b7f54ae83ee993707a15d417bf
 Unapplied:
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8
   rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de

diff --git a/patches/build-preload b/patches/build-preload
index bd1e38edbc5a382759b3a909c4c5e5a5898fb63a..305e71eded4b02e05d15f8f7994b64a116787ffc 100644 (file)
--- a/patches/build-preload
+++ b/patches/build-preload
@@ -1,5 +1,5 @@
 Bottom: 91153ae24e0243a1f3cf380e415d9bc5e8094789
-Top:    c076dedd7fc3859a921947137ceb8b57fa008eb2
+Top:    00e1df4bcbc33b38df0e85b87fbbabd2da64d772
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-09 14:58:14 -0700
 
@@ -16,28 +16,29 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/Makefile.am b/Makefile.am
-index 51b2f89..b734d45 100644
+index 51b2f89..901e8ee 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,11 +1,12 @@
  INCLUDES = -I$(srcdir)/include
  
 -lib_LTLIBRARIES = src/librdmacm.la
-+lib_LTLIBRARIES = src/librdmacm.la src/rspreload.la
++lib_LTLIBRARIES = src/librdmacm.la src/librspreload.la
  
  ACLOCAL_AMFLAGS = -I config
  AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\"
  
  src_librdmacm_la_CFLAGS = $(AM_CFLAGS)
-+src_rspreload_la_CFLAGS = $(AM_CFLAGS) -shared -fPIC
++src_librspreload_la_CFLAGS = $(AM_CFLAGS)
  
  if HAVE_LD_VERSION_SCRIPT
      librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map
-@@ -19,6 +20,8 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \
+@@ -19,6 +20,9 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \
                           $(librdmacm_version_script)
  src_librdmacm_la_DEPENDENCIES =  $(srcdir)/src/librdmacm.map
  
-+src_rspreload_la_SOURCES = src/preload.c src/indexer.c
++src_librspreload_la_SOURCES = src/preload.c src/indexer.c
++src_librspreload_la_LIBADD = $(top_builddir)/src/librdmacm.la
 +
  bin_PROGRAMS = examples/ucmatose examples/rping examples/udaddy examples/mckey \
               examples/rdma_client examples/rdma_server examples/rdma_xclient \

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index c485592..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,38 +0,0 @@
-Bottom: c076dedd7fc3859a921947137ceb8b57fa008eb2
-Top:    00e1df4bcbc33b38df0e85b87fbbabd2da64d772
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-09 17:16:01 -0700
-
-Refresh of build-preload
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index b734d45..901e8ee 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,12 +1,12 @@
- INCLUDES = -I$(srcdir)/include
- 
--lib_LTLIBRARIES = src/librdmacm.la src/rspreload.la
-+lib_LTLIBRARIES = src/librdmacm.la src/librspreload.la
- 
- ACLOCAL_AMFLAGS = -I config
- AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DRDMADIR=\"@rdmadir@\"
- 
- src_librdmacm_la_CFLAGS = $(AM_CFLAGS)
--src_rspreload_la_CFLAGS = $(AM_CFLAGS) -shared -fPIC
-+src_librspreload_la_CFLAGS = $(AM_CFLAGS)
- 
- if HAVE_LD_VERSION_SCRIPT
-     librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map
-@@ -20,7 +20,8 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \
-                          $(librdmacm_version_script)
- src_librdmacm_la_DEPENDENCIES =  $(srcdir)/src/librdmacm.map
- 
--src_rspreload_la_SOURCES = src/preload.c src/indexer.c
-+src_librspreload_la_SOURCES = src/preload.c src/indexer.c
-+src_librspreload_la_LIBADD = $(top_builddir)/src/librdmacm.la
- 
- bin_PROGRAMS = examples/ucmatose examples/rping examples/udaddy examples/mckey \
-              examples/rdma_client examples/rdma_server examples/rdma_xclient \