diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2017-07-31 19:45:56 +0200 |
|---|---|---|
| committer | Reuben Thomas <rrt@sc3d.org> | 2017-07-31 19:45:56 +0200 |
| commit | 738170d6ecfb97c844b0ac49f39a494713412607 (patch) | |
| tree | 266102b22eb9fdac60ca1145b7ae6256aa3738ba | |
| parent | 945631867762d006b3cda6b872145dd187eef812 (diff) | |
| download | enchant-738170d6ecfb97c844b0ac49f39a494713412607.tar.gz | |
Use newer gnulib with improved relocatable-lib-lgpl
| -rw-r--r-- | gl/build-aux/relocatable.supp | 8 | ||||
| -rw-r--r-- | gl/modules/relocatable-lib-lgpl | 31 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/enchant_providers/Makefile.am | 4 |
4 files changed, 4 insertions, 41 deletions
diff --git a/gl/build-aux/relocatable.supp b/gl/build-aux/relocatable.supp deleted file mode 100644 index c3dfeff..0000000 --- a/gl/build-aux/relocatable.supp +++ /dev/null @@ -1,8 +0,0 @@ -# set_this_relocation_prefix leaks intentionally -{ - relocatable/set_this_relocation_prefix - Memcheck:Leak - fun:malloc - fun:set_this_relocation_prefix - fun:set_relocation_prefix -} diff --git a/gl/modules/relocatable-lib-lgpl b/gl/modules/relocatable-lib-lgpl deleted file mode 100644 index 0783864..0000000 --- a/gl/modules/relocatable-lib-lgpl +++ /dev/null @@ -1,31 +0,0 @@ -Description: -Help make libraries relocatable, that is, to allow them to function -properly when copied to an arbitrary directory. - -Files: -build-aux/relocatable.supp -doc/relocatable.texi -lib/relocatable.h -lib/relocatable.c -m4/relocatable-lib.m4 - -Depends-on: -strdup - -configure.ac: -gl_RELOCATABLE_LIBRARY -if test $RELOCATABLE = yes; then - AC_LIBOBJ([relocatable]) -fi - -Makefile.am: -DEFS += -DNO_XMALLOC - -Include: -"relocatable.h" - -License: -LGPLv2+ - -Maintainer: -Ben Pfaff diff --git a/tests/Makefile.am b/tests/Makefile.am index 3840cf3..c70919d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,7 +6,7 @@ ENCHANT_CONFIG_DIR = config AM_TESTS_ENVIRONMENT = \ export ENCHANT_CONFIG_DIR=$(ENCHANT_CONFIG_DIR); \ - if test -n "$(VALGRIND)"; then export VALGRIND='$(VALGRIND) --suppressions=$(top_srcdir)/build-aux/relocatable.supp'; fi; \ + if test -n "$(VALGRIND)"; then export VALGRIND='$(VALGRIND) --suppressions=$(top_srcdir)/lib/relocatable.valgrind'; fi; \ export LIBTOOL=$(top_builddir)/libtool; \ rm -rf test.pwl; \ $(MAKE) libenchant-copy; \ diff --git a/tests/enchant_providers/Makefile.am b/tests/enchant_providers/Makefile.am index a0ba65d..be56872 100644 --- a/tests/enchant_providers/Makefile.am +++ b/tests/enchant_providers/Makefile.am @@ -1,10 +1,12 @@ +# FIXME: common up with tests/Makefile.am + AM_CPPFLAGS = -I$(top_srcdir)/src $(ENCHANT_CFLAGS) ENCHANT_CONFIG_DIR = config AM_TESTS_ENVIRONMENT = \ export ENCHANT_CONFIG_DIR=$(ENCHANT_CONFIG_DIR); \ - if test -n "$(VALGRIND)"; then export VALGRIND='$(VALGRIND) --suppressions=$(top_srcdir)/build-aux/relocatable.supp'; fi; \ + if test -n "$(VALGRIND)"; then export VALGRIND='$(VALGRIND) --suppressions=$(top_srcdir)/lib/relocatable.valgrind'; fi; \ export LIBTOOL=$(top_builddir)/libtool; \ $(MAKE) libenchant-copy; \ cp $(top_builddir)/providers/@objdir@/*@shlibext@ $(builddir) || :; |