From: Sean Hefty Date: Wed, 11 Jul 2012 00:45:33 +0000 (-0700) Subject: refresh (create temporary patch) X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2a0a331915d039406479bcc2135bd98603344131;p=~shefty%2Flibrdmacm.git refresh (create temporary patch) --- diff --git a/meta b/meta index 1e1d70a1..073d1517 100644 --- a/meta +++ b/meta @@ -1,8 +1,9 @@ Version: 1 -Previous: 6e3683ad10cf5b4babb574952f949a0e36fa5bf9 -Head: 54695d4a26cb90b1f65ed8a97a28e83bb5c45081 +Previous: 3518d9e0b7009ed6ae4885a03e18a1bd7e0fa08a +Head: 45dd87e95cbdc3d1d6ad91b777784a5485d420d8 Applied: build-preload: 54695d4a26cb90b1f65ed8a97a28e83bb5c45081 + refresh-temp: 45dd87e95cbdc3d1d6ad91b777784a5485d420d8 Unapplied: waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8 rs-1sge: 8ec392829399dec7ed5c608b8697a482e5faa2de diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..a2fd922d --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,79 @@ +Bottom: c64a76f16b2f730e7c7514ef9ef676f4e60f07e0 +Top: fa0afbb920504a794165a458b584e32efebb3ce6 +Author: Sean Hefty +Date: 2012-07-10 17:45:33 -0700 + +Refresh of build-preload + +--- + +diff --git a/Makefile.am b/Makefile.am +index e01b4cc..581cded 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -12,10 +12,8 @@ src_librspreload_la_CFLAGS = $(AM_CFLAGS) + + if HAVE_LD_VERSION_SCRIPT + librdmacm_version_script = -Wl,--version-script=$(srcdir)/src/librdmacm.map +- librspreload_version_script = + else + librdmacm_version_script = +- librspreload_version_script = + endif + + src_librdmacm_la_SOURCES = src/cma.c src/addrinfo.c src/acm.c \ +@@ -25,8 +23,7 @@ src_librdmacm_la_LDFLAGS = -version-info 1 -export-dynamic \ + src_librdmacm_la_DEPENDENCIES = $(srcdir)/src/librdmacm.map + + src_librspreload_la_SOURCES = src/preload.c src/indexer.c +-src_librspreload_la_LDFLAGS = -version-info 1 -export-dynamic \ +- $(librspreload_version_script) ++src_librspreload_la_LDFLAGS = -version-info 1 -export-dynamic + src_librspreload_la_DEPENDENCIES = $(srcdir)/src/librspreload.map + src_librspreload_la_LIBADD = $(top_builddir)/src/librdmacm.la + +@@ -127,7 +124,7 @@ man_MANS = \ + man/rdma_cm.7 \ + man/rsocket.7 + +-EXTRA_DIST = src/cma.h src/indexer.h src/librdmacm.map src/librspreload.map \ ++EXTRA_DIST = src/cma.h src/indexer.h src/librdmacm.map \ + librdmacm.spec.in $(man_MANS) + + dist-hook: librdmacm.spec +diff --git a/src/librspreload.map b/src/librspreload.map +deleted file mode 100644 +index 554050d..0000000 +--- a/src/librspreload.map ++++ /dev/null +@@ -1,30 +0,0 @@ +-RSPRELOAD_1.0 { +- global: +- socket; +- bind; +- listen; +- accept; +- connect; +- shutdown; +- close; +- recv; +- recvfrom; +- recvmsg; +- send; +- sendto; +- sendmsg; +- read; +- readv; +- write; +- writev; +- poll; +- select; +- getpeername; +- getsockname; +- setsockopt; +- getsockopt; +- fcntl; +- poll; +- select; +- local: *; +-};