From: Sean Hefty Date: Tue, 10 Jul 2012 00:16:01 +0000 (-0700) Subject: refresh (create temporary patch) X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=511fdb5dec277d48b84177ab9c702a29e9b2ce35;p=~shefty%2Flibrdmacm.git refresh (create temporary patch) --- diff --git a/meta b/meta index 482d1466..23875a00 100644 --- a/meta +++ b/meta @@ -1,8 +1,9 @@ Version: 1 -Previous: 1f1668ac34bdfd514de7d9a95c5cfaeefce5fc58 -Head: e90fdf7fc7a1f0a1068e625586808cd76baf3504 +Previous: 737710deb36f1e3e2f99bb9550d1cd341deff2bd +Head: 906279ec724cda7a619dc712141479adc26f9448 Applied: build-preload: e90fdf7fc7a1f0a1068e625586808cd76baf3504 + refresh-temp: 906279ec724cda7a619dc712141479adc26f9448 Unapplied: waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8 rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..c4855921 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,38 @@ +Bottom: c076dedd7fc3859a921947137ceb8b57fa008eb2 +Top: 00e1df4bcbc33b38df0e85b87fbbabd2da64d772 +Author: Sean Hefty +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 \