[Glibc-bsd-commits] r4730 - in trunk/freebsd-libs/debian: . patches

[Robert Millan]

Author: rmh
Date: 2013-07-11 11:44:43 +0000 (Thu, 11 Jul 2013)
New Revision: 4730

Added:
   trunk/freebsd-libs/debian/patches/missing_static_decl.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/series
Log:
missing_static_decl.diff: Fix for _libdwarf_errors being exported in libdwarf.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2013-07-11 10:55:27 UTC (rev 4729)
+++ trunk/freebsd-libs/debian/changelog	2013-07-11 11:44:43 UTC (rev 4730)
@@ -5,6 +5,8 @@
   * Enable __FreeBSD_version when building freebsd-libs sources.
   * preserve_libkvm_abi.diff (and no_kvm_uread_in_freebsd10.diff):
     Backport fix from upstream to preserve 9.0 ABI in libkvm.
+  * missing_static_decl.diff: Fix for _libdwarf_errors being exported in
+    libdwarf.
 
  -- Robert Millan <rmh at debian.org>  Tue, 09 Jul 2013 22:49:44 +0200
 

Added: trunk/freebsd-libs/debian/patches/missing_static_decl.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/missing_static_decl.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/missing_static_decl.diff	2013-07-11 11:44:43 UTC (rev 4730)
@@ -0,0 +1,27 @@
+
+From rev 241720 in HEAD
+
+_libdwarf_errors made it into public ABI before this patch.
+
+--- a/lib/libdwarf/dwarf_errmsg.c
++++ b/lib/libdwarf/dwarf_errmsg.c
+@@ -29,7 +29,7 @@
+ #include <stdio.h>
+ #include "_libdwarf.h"
+ 
+-const char *_libdwarf_errors[] = {
++static const char *_libdwarf_errors[] = {
+ #define	DEFINE_ERROR(N,S)		[DWARF_E_##N] = S
+ 	DEFINE_ERROR(NONE,		"No Error"),
+ 	DEFINE_ERROR(ERROR,		"An error"),
+--- a/lib/libelf/elf_errmsg.c
++++ b/lib/libelf/elf_errmsg.c
+@@ -36,7 +36,7 @@
+  * Retrieve a human readable translation for an error message.
+  */
+ 
+-const char *_libelf_errors[] = {
++static const char *_libelf_errors[] = {
+ #define	DEFINE_ERROR(N,S)	[ELF_E_##N] = S
+ 	DEFINE_ERROR(NONE,	"No Error"),
+ 	DEFINE_ERROR(ARCHIVE,	"Malformed ar(1) archive"),

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2013-07-11 10:55:27 UTC (rev 4729)
+++ trunk/freebsd-libs/debian/patches/series	2013-07-11 11:44:43 UTC (rev 4730)
@@ -1,5 +1,6 @@
 # Patches from (or merged in) upstream
 preserve_libkvm_abi.diff
+missing_static_decl.diff
 
 # Patches that are in good shape for merging upstream