Add a patch to link libreaddir-rand to libdl

This should fix test failures on Ubuntu (Closes: #826857)
This commit is contained in:
Simon McVittie 2016-06-14 15:29:18 -04:00
parent f4fd8ee1e8
commit 756a435af8
3 changed files with 35 additions and 0 deletions

2
debian/changelog vendored
View File

@ -8,6 +8,8 @@ ostree (2016.5-4) UNRELEASED; urgency=medium
up any stray processes even if the test fails
* If build-time tests fail, try 4 more times to get an idea of
whether the failure is reproducible
* Add a patch to link libreaddir-rand to libdl, which should fix
test failures on Ubuntu (Closes: #826857)
-- Simon McVittie <smcv@debian.org> Sat, 11 Jun 2016 19:52:40 +0100

View File

@ -0,0 +1,32 @@
From: Simon McVittie <smcv@debian.org>
Date: Sun, 12 Jun 2016 10:25:21 -0400
Subject: Link libreaddir-rand to libdl
It uses dlsym(). There's no point in being extra-portable here
because OSTree only targets Linux anyway.
Signed-off-by: Simon McVittie <smcv@debian.org>
Closes: #336
Approved by: cgwalters
Applied-upstream: 2016.6, commit:b9e18b83fd195c980c5dffab4bedf3fa79b19a2e
---
Makefile-tests.am | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/Makefile-tests.am b/Makefile-tests.am
index b3d7514..c7e78cf 100644
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -130,7 +130,10 @@ endif
test_ltlibraries = libreaddir-rand.la
libreaddir_rand_la_SOURCES = tests/readdir-rand.c
libreaddir_rand_la_CFLAGS = $(OT_INTERNAL_GIO_UNIX_CFLAGS)
-libreaddir_rand_la_LIBADD = $(OT_INTERNAL_GIO_UNIX_LIBS)
+libreaddir_rand_la_LIBADD = \
+ -ldl \
+ $(OT_INTERNAL_GIO_UNIX_LIBS) \
+ $(NULL)
libreaddir_rand_la_LDFLAGS = -avoid-version
if !ENABLE_INSTALLED_TESTS
libreaddir_rand_la_LDFLAGS += -rpath $(abs_builddir)

View File

@ -2,3 +2,4 @@ libtest-show-files-contents-when-assertions-about-them-fa.patch
test-parent-this-test-requires-user-xattrs.patch
tests-Use-strict-mode-by-default-for-C-tests.patch
test-sysroot.js-set-strict-mode-when-sourcing-libtest.sh.patch
Link-libreaddir-rand-to-libdl.patch