From: Carsten Schlote <[email protected]>
Signed-off-by: Carsten Schlote <[email protected]>
---
patches/libnih-1.0.0/autogen.sh | 5 +
patches/libnih-1.0.0/remove-abort-msg-hack.patch | 94 ++++++++++++++++++++++
patches/libnih-1.0.0/series | 1 +
3 files changed, 100 insertions(+), 0 deletions(-)
create mode 100644 patches/libnih-1.0.0/autogen.sh
create mode 100644 patches/libnih-1.0.0/remove-abort-msg-hack.patch
create mode 100644 patches/libnih-1.0.0/series
diff --git a/patches/libnih-1.0.0/autogen.sh b/patches/libnih-1.0.0/autogen.sh
new file mode 100644
index 0000000..73c682f
--- /dev/null
+++ b/patches/libnih-1.0.0/autogen.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+autoreconf -fvi
+
+echo "Now run ./configure"
diff --git a/patches/libnih-1.0.0/remove-abort-msg-hack.patch
b/patches/libnih-1.0.0/remove-abort-msg-hack.patch
new file mode 100644
index 0000000..4d0e8fc
--- /dev/null
+++ b/patches/libnih-1.0.0/remove-abort-msg-hack.patch
@@ -0,0 +1,94 @@
+Reverted reference to __abort_msg.
+
+This hack needs to be added to eglibc and the toolchain later and
+this patch can be removed.
+
+Not for upstream.
+---
+ nih/logging.c | 6 +++---
+ nih/tests/test_logging.c | 14 +++++++-------
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+Index: libnih-1.0.0/nih/logging.c
+===================================================================
+--- libnih-1.0.0.orig/nih/logging.c 2009-12-10 14:41:38.000000000 +0100
++++ libnih-1.0.0/nih/logging.c 2009-12-10 14:44:17.000000000 +0100
+@@ -43,7 +43,7 @@
+ *
+ * A glibc variable that keeps the assertion message in the core dump.
+ **/
+-extern char *__abort_msg;
++/* extern char *__abort_msg; */
+
+ /**
+ * logger:
+@@ -120,10 +120,10 @@
+ static void
+ nih_log_abort_message (const char *message)
+ {
+- if (__abort_msg)
++/* if (__abort_msg)
+ nih_discard (__abort_msg);
+
+- __abort_msg = NIH_MUST (nih_strdup (NULL, message));
++ __abort_msg = NIH_MUST (nih_strdup (NULL, message)); */
+ }
+
+ /**
+Index: libnih-1.0.0/nih/tests/test_logging.c
+===================================================================
+--- libnih-1.0.0.orig/nih/tests/test_logging.c 2009-12-10 14:41:38.000000000
+0100
++++ libnih-1.0.0/nih/tests/test_logging.c 2009-12-10 14:43:43.000000000
+0100
+@@ -31,7 +31,7 @@
+ #include <nih/main.h>
+
+
+-extern char *__abort_msg;
++/* extern char *__abort_msg; */
+
+ static NihLogLevel last_priority = NIH_LOG_UNKNOWN;
+ static char * last_message = NULL;
+@@ -161,7 +161,7 @@
+ */
+ TEST_FEATURE ("with fatal message");
+ TEST_ALLOC_FAIL {
+- __abort_msg = NULL;
++ /* __abort_msg = NULL; */
+ last_priority = NIH_LOG_UNKNOWN;
+ last_message = NULL;
+
+@@ -173,10 +173,10 @@
+ TEST_EQ (last_priority, NIH_LOG_FATAL);
+ TEST_EQ_STR (last_message, "message with some 20 formatting");
+
+- TEST_NE_P (__abort_msg, NULL);
++/* TEST_NE_P (__abort_msg, NULL);
+ TEST_ALLOC_PARENT (__abort_msg, NULL);
+ TEST_EQ_STR (__abort_msg, "message with some 20 formatting");
+-
++*/
+ free (last_message);
+ }
+
+@@ -190,7 +190,7 @@
+ msg = nih_strdup (NULL, "test");
+ }
+
+- __abort_msg = msg;
++ /* __abort_msg = msg; */
+ TEST_FREE_TAG (msg);
+
+ last_priority = NIH_LOG_UNKNOWN;
+@@ -206,10 +206,10 @@
+
+ TEST_FREE (msg);
+
+- TEST_NE_P (__abort_msg, NULL);
++/* TEST_NE_P (__abort_msg, NULL);
+ TEST_ALLOC_PARENT (__abort_msg, NULL);
+ TEST_EQ_STR (__abort_msg, "message with some 20 formatting");
+-
++*/
+ free (last_message);
+ }
+
diff --git a/patches/libnih-1.0.0/series b/patches/libnih-1.0.0/series
new file mode 100644
index 0000000..1d19617
--- /dev/null
+++ b/patches/libnih-1.0.0/series
@@ -0,0 +1 @@
+remove-abort-msg-hack.patch
--
1.6.5.6.gb3118
--
ptxdist mailing list
[email protected]
