Rename-gnulib-symbols

1 files changed, 40 insertions, 0 deletions

diff --git a/0001-Rename-gnulib-symbols.patch b/0001-Rename-gnulib-symbols.patch
new file mode 100644
index 000000000000..cd703d3b1fd7
--- /dev/null
+++ b/0001-Rename-gnulib-symbols.patch
@@ -0,0 +1,40 @@
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Fri, 14 Aug 2015 18:40:16 +0200
+Subject: [PATCH] Rename gnulib symbols
+
+---
+ configure.ac           | 1 +
+ lib/glm4/strverscmp.m4 | 5 +++++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 551ad3f..d72b1d6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,6 +35,7 @@ AC_SUBST(LT_AGE, 5)
+ AC_PROG_CC
+ gl_EARLY
+ lgl_EARLY
++AC_DEFINE([hash_pjw_bare], [libtasn_hash_pjw_bare], [Rename hash_pjw_bare])
+ AC_PROG_YACC
+ 
+ AC_ARG_ENABLE(doc,
+diff --git a/lib/glm4/strverscmp.m4 b/lib/glm4/strverscmp.m4
+index cbcca3f..7a9f2e1 100644
+--- a/lib/glm4/strverscmp.m4
++++ b/lib/glm4/strverscmp.m4
+@@ -14,6 +14,11 @@ AC_DEFUN([gl_FUNC_STRVERSCMP],
+   if test $ac_cv_func_strverscmp = no; then
+     HAVE_STRVERSCMP=0
+   fi
++
++  if test "x$HAVE_STRVERSCMP" == "x0"; then
++    AC_DEFINE([strverscmp], [libtasn_strverscmp], [Rename strverscmp])
++    AC_DEFINE([__strverscmp], [libtasn_strverscmp], [Rename strverscmp])
++  fi
+ ])
+ 
+ # Prerequisites of lib/strverscmp.c.
+-- 
+2.11.0
+