diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2015-08-14 18:51:59 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-08-14 18:52:32 +0200 |
| commit | 6a1d5bb6ed37095d8de81d2fc928f6b096c51076 (patch) | |
| tree | 799db40520319cbe3448640c720417448a70b76b /recipes | |
| parent | c5d237e9d0347ae48b8517b1cd12d648c3d87c85 (diff) | |
libtasn1: Rename gnulib symbols to prevent conflicts with other libraries
Diffstat (limited to 'recipes')
| -rw-r--r-- | recipes/libtasn1.recipe | 2 | ||||
| -rw-r--r-- | recipes/libtasn1/0001-Rename-gnulib-symbols.patch | 70 |
2 files changed, 72 insertions, 0 deletions
diff --git a/recipes/libtasn1.recipe b/recipes/libtasn1.recipe index 5659fcd6..b2aeb70c 100644 --- a/recipes/libtasn1.recipe +++ b/recipes/libtasn1.recipe @@ -6,6 +6,8 @@ class Recipe(recipe.Recipe): stype = SourceType.TARBALL url = 'http://ftp.gnu.org/gnu/libtasn1/libtasn1-4.4.tar.gz' licenses = [License.LGPLv2_1Plus] + autoreconf = True + patches = ['libtasn1/0001-Rename-gnulib-symbols.patch'] files_libs = ['libtasn1'] files_devel = ['include/libtasn1.h', 'lib/pkgconfig/libtasn1.pc'] diff --git a/recipes/libtasn1/0001-Rename-gnulib-symbols.patch b/recipes/libtasn1/0001-Rename-gnulib-symbols.patch new file mode 100644 index 00000000..ecd7e878 --- /dev/null +++ b/recipes/libtasn1/0001-Rename-gnulib-symbols.patch @@ -0,0 +1,70 @@ +From bf1346c6ec81c1d582d795da74706ee9d534c7df Mon Sep 17 00:00:00 2001 +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 + +--- + Makefile.am | 2 +- + configure.ac | 1 + + lib/gllib/strverscmp.c | 3 --- + lib/glm4/strverscmp.m4 | 5 +++++ + 4 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index a2fc98a..d5128dc 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -26,7 +26,7 @@ EXTRA_DIST = windows/asn1-parser/asn1-parser.vcproj \ + windows/test-parser/test-parser.vcproj \ + windows/test-tree/test-tree.vcproj windows/libtasn14win.mk + +-SUBDIRS = gl lib src examples tests doc ++SUBDIRS = gl lib src examples tests + + ACLOCAL_AMFLAGS = -I m4 -I gl/m4 -I lib/glm4 + +diff --git a/configure.ac b/configure.ac +index 8130ef2..1e8e998 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -35,6 +35,7 @@ AC_SUBST(LT_AGE, 4) + AC_PROG_CC + gl_EARLY + lgl_EARLY ++AC_DEFINE([hash_pjw_bare], [libtasn_hash_pjw_bare], [Rename hash_pjw_bare]) + AC_PROG_YACC + + dnl Checks for programs. +diff --git a/lib/gllib/strverscmp.c b/lib/gllib/strverscmp.c +index 0abc1fe..26d7dee 100644 +--- a/lib/gllib/strverscmp.c ++++ b/lib/gllib/strverscmp.c +@@ -45,9 +45,6 @@ + of "digit" even when the host does not conform to POSIX. */ + #define ISDIGIT(c) ((unsigned int) (c) - '0' <= 9) + +-#undef __strverscmp +-#undef strverscmp +- + #ifndef weak_alias + # define __strverscmp strverscmp + #endif +diff --git a/lib/glm4/strverscmp.m4 b/lib/glm4/strverscmp.m4 +index aca1d54..45a12e9 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.5.0 + |