refresh (create temporary patch)

diff --git a/meta b/meta
index fae28ca120549f8778a97f6abede02e8d15d7b84..cbc3f7afaaeecc9ee0172451414233dffdabb3b8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,7 +1,8 @@
 Version: 1
-Previous: 0ac74df476fd8c4a3cf787f5c2c00aa74c2559cc
-Head: bb215b17bde143da235235bff27cfeab8fa42bcc
+Previous: 1b6d3820a2adea8b6db044d340ca530058366e27
+Head: bd0346e4080556f8a065dcffb2f6bb61ee0d1359
 Applied:
   atomic: bb215b17bde143da235235bff27cfeab8fa42bcc
+  refresh-temp: bd0346e4080556f8a065dcffb2f6bb61ee0d1359
 Unapplied:
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..a5de81f
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,67 @@
+Bottom: 9c0d7b60a142530a1903dedf47aa9e62d53b42ef
+Top:    59952986bf11b417c6da864108e5278e0fbca08a
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-08-25 16:08:28 -0700
+
+Refresh of atomic
+
+---
+
+diff --git a/configure.in b/configure.in
+index 28f98ed..ce55f75 100755
+--- a/configure.in
++++ b/configure.in
+@@ -49,7 +49,7 @@ AC_TRY_LINK([],
+     AC_MSG_RESULT(yes),\r
+     [\r
+         AC_MSG_RESULT(no - defining atomics)\r
+-        AC_DEFINE(DEFINE_ATOMICS, [], [defining atomics])\r
++        AC_DEFINE(DEFINE_ATOMICS, [], [Set to 1 to implement atomics])\r
+     ])\r
+ \r
+ AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,\r
+diff --git a/src/acm.c b/src/acm.c
+index 56fbb01..820365c 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -27,6 +27,10 @@
+  * SOFTWARE.
+  */
+ 
++#if HAVE_CONFIG_H
++#  include <config.h>
++#endif /* HAVE_CONFIG_H */
++
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <string.h>
+diff --git a/src/acme.c b/src/acme.c
+index 7428a57..e03679f 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -27,6 +27,10 @@
+  * SOFTWARE.
+  */
+ 
++#if HAVE_CONFIG_H
++#  include <config.h>
++#endif /* HAVE_CONFIG_H */
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/libacm.c b/src/libacm.c
+index 32fd7e2..9d56cd2 100644
+--- a/src/libacm.c
++++ b/src/libacm.c
+@@ -27,6 +27,10 @@
+  * SOFTWARE.
+  */
+ 
++#if HAVE_CONFIG_H
++#  include <config.h>
++#endif /* HAVE_CONFIG_H */
++
+ #include <osd.h>
+ #include "libacm.h"
+ #include <infiniband/acm.h>